Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

projects / firefly-linux-kernel-4.4.55.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 12d7d4e d594f1f b176654 0a0d128 0005ae7)

author	Tony Lindgren <tony@atomide.com>
	Thu, 3 Mar 2011 01:11:18 +0000 (17:11 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 3 Mar 2011 01:11:18 +0000 (17:11 -0800)
commit	b2833a0578453449dce1b8b8e54f67a544c5e37f
tree	0aba11913a8deb4bdaaa08fdd9c7c1b151c8c099	tree \| snapshot
parent	12d7d4e0ed8fecf7f74c89483b55b300be6e5901	commit \| diff
parent	d594f1f31afe13edd8c02f3854a65cc58cfb3b74	commit \| diff
parent	b176654e7796b2812632e7c4a1a4b6efbfae5f1b	commit \| diff
parent	0a0d128d023a49eb8afa0e988e6773416318a0b5	commit \| diff
parent	0005ae73cfe44ee42d0be12a12cc82bf982f518e	commit \| diff

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	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/board-3430sdp.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/board-devkit8000.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/board-igep0020.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/board-omap3pandora.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/board-omap4panda.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/board-rx51-peripherals.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/board-zoom-peripherals.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/devices.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/mailbox.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_2420_data.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_2430_data.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/prcm-common.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/plat-omap/include/plat/omap_hwmod.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.