]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:31:07 +0000 (23:31 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:31:07 +0000 (23:31 +0000)
commit64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39
treea434977a6caa9b41cc0daaf71dbd76ac8693aba6
parentb93a4afcff7be859e30cad2a305731516057d6cf
parent17ccb834d517c66c09123c24ba8553c5b14e0f78
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
arch/arm/Kconfig
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
drivers/serial/Kconfig