summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/include
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-07-04 09:29:31 +0200
committerTony Lindgren <tony@atomide.com>2012-07-04 09:29:31 +0200
commit3f96a2d90e6923e2dd1e35d2f149a70a4d0f678c (patch)
treea10372c71503f2ee6e4cdfef42357dce8b620e02 /arch/arm/mach-omap2/include
parentLinux 3.5-rc5 (diff)
parentMerge branch 'cleanup-hwmod' into cleanup (diff)
parentARM: OMAP2+: Simplify dmtimer clock aliases (diff)
parentMerge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
downloadlinux-3f96a2d90e6923e2dd1e35d2f149a70a4d0f678c.tar.xz
linux-3f96a2d90e6923e2dd1e35d2f149a70a4d0f678c.zip
Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2