summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2011-07-10 06:04:55 -0600
committerPaul Walmsley <paul@pwsan.com>2011-07-10 06:04:55 -0600
commitdb47cccebd74e575963bc80cc5ac926399388a21 (patch)
treef3a91ec50cb5bbb0099e1afc1b46c574338989ca /arch/arm/mach-omap2
parent665d001338b494d6d62810aa99b4c0fa1a0884b9 (diff)
parenta53025724052b2b1edbc982a4a248784638f563d (diff)
parentad03f1cb2d44257afa63a2171e84daad931c48cb (diff)
parentbf1e0776cf5e4ef2622de3a4b63f84175b5b48ab (diff)
Merge branches 'omap4_clockdomain_hwmod_3.1', 'clock_debugfs_a_3.1', 'omap4_clock_auxclk_3.1' and 'omap_device_a_3.1' into prcm-devel-3.1