]> git.karo-electronics.de Git - mv-sheeva.git/commit - arch/powerpc/configs/e55xx_smp_defconfig
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 19:14:38 +0000 (20:14 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 19:14:38 +0000 (20:14 +0100)
commitb3773301c4290f054aa2aa5379e59a1bf4f78bdf
treeaac1619d32800393b587bf034c7dadb9e3c24f7b
parentbe6786ac738801d39cfd264ec88c352efd029578
parent1a0b1eac5012326e52d1dcf78695ac08f41c37d7
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
drivers/video/sh_mobile_hdmi.c
arch/arm/mach-shmobile/board-ap4evb.c
arch/sh/boards/mach-ecovec24/setup.c
drivers/video/sh_mobile_hdmi.c
drivers/video/sh_mobile_lcdcfb.c