]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a99372 1b1d3ec)
Merge branch 'late/kirkwood' into late/soc
authorOlof Johansson <olof@lixom.net>
Fri, 5 Oct 2012 03:17:25 +0000 (20:17 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 5 Oct 2012 03:17:25 +0000 (20:17 -0700)
commitf5f368af097c5a10fd236b21f1bb489d51069438
treeadbfb8bcc7cc73b83bf2b784fa331911ba03573atree | snapshot
parent5a993723f547a9040dcc3e4962c286c7337c59bbcommit | diff
parent1b1d3ec068f353d2779c87f4618bc5c7b9badd6ccommit | diff
Merge branch 'late/kirkwood' into late/soc

Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.

Final contents described in shared tag.

Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
17 files changed:
arch/arm/mach-omap1/devices.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/Makefile diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-h4.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap4panda.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/control.h diff1 | diff2 | blob | history
arch/arm/mach-omap2/devices.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod_2420_data.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod_2430_data.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c diff1 | diff2 | blob | history
arch/arm/plat-omap/include/plat/omap_device.h diff1 | diff2 | blob | history
arch/arm/plat-omap/include/plat/omap_hwmod.h diff1 | diff2 | blob | history
arch/arm/plat-omap/omap_device.c diff1 | diff2 | blob | history
drivers/spi/spi-omap2-mcspi.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.