]> git.proxmox.com Git - mirror_ubuntu-jammy-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)
commitb2833a0578453449dce1b8b8e54f67a544c5e37f
tree0aba11913a8deb4bdaaa08fdd9c7c1b151c8c099
parent12d7d4e0ed8fecf7f74c89483b55b300be6e5901
parentd594f1f31afe13edd8c02f3854a65cc58cfb3b74
parentb176654e7796b2812632e7c4a1a4b6efbfae5f1b
parent0a0d128d023a49eb8afa0e988e6773416318a0b5
parent0005ae73cfe44ee42d0be12a12cc82bf982f518e
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