summaryrefslogtreecommitdiffstats
path: root/include/net/xfrm.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-09-12 21:29:07 -0700
committerTony Lindgren <tony@atomide.com>2012-09-12 21:29:07 -0700
commit11964f53eb4d9ce59a058be9999d9cfcb1ced878 (patch)
treeda3b0469faa749b7ac42ca617980d3f4a234af75 /include/net/xfrm.h
parent68cb700c59fae6cd539c9dc1e9f2584f671935a0 (diff)
parent83c115426818378370b8cf2be16ca19bdcdc2ac4 (diff)
downloadblackbird-op-linux-11964f53eb4d9ce59a058be9999d9cfcb1ced878.tar.gz
blackbird-op-linux-11964f53eb4d9ce59a058be9999d9cfcb1ced878.zip
Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx should now boot on mainline after this is applied, according to Vaibhav. This second version includes trailing commas at the end of structure records at Tony's request. It also adds a OMAP_INTC_START macro expansion to each IRQ number to make the sparseirq conversion easier. Basic build, boot, and PM test transcripts are here: http://www.pwsan.com/omap/testlogs/am33xx_hwmod_clock_devel_3.7/20120912165952/
Diffstat (limited to 'include/net/xfrm.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud