]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 19 Oct 2010 19:12:24 +0000 (20:12 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 19 Oct 2010 19:12:24 +0000 (20:12 +0100)
commit4b301af3e691819e1bd19ee0c62174b1d425eb8c
tree7ed94961b196c81fcd413e2b04d1e6945d6d227a
parent66992fb8785b0fce1cd65a2ebb60b2b9773a414f
parent52f1b6f60ba16e5a76218760bab1a5fc4bb35b41
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-imx/mach-cpuimx27.c

AT91 conflict resolution:
Acked-by: Anders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mach-cpuimx27.c
drivers/net/Kconfig