]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc...
authorTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 01:11:18 +0000 (17:11 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 01:11:18 +0000 (17:11 -0800)
commit124ce4682956434c8bded8991b280e74205d72d4
tree0aba11913a8deb4bdaaa08fdd9c7c1b151c8c099
parented22825fe53cffb0d408e34919fff37a292515bc
parent002c0a5dafd3b209a166abb4faeff29cf289c4b2
parent45bb711acd5b6bcb58a3a2eccfb77d6cead5974e
parentdd47834eeeebe36d23b42fedc3a3139fe0467332
parentb214c461034faf1e912c572ef11094cfce40c0d3
Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc' into omap-for-linus

Conflicts:
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
19 files changed:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-zoom-peripherals.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/mailbox.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/prcm-common.h
arch/arm/plat-omap/include/plat/omap_hwmod.h