]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:29:32 +0000 (23:29 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:29:32 +0000 (23:29 +0000)
commitb93a4afcff7be859e30cad2a305731516057d6cf
treefb5fe55864e16527e453efd18790a34db22ee2a1
parent62c132a8008991530839401674ce8e1b12b005d3
parent9b1489e989695c4d502865f8bec616c0f17e99ab
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

Conflicts:
arch/arm/Makefile
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/plat-mxc/include/mach/uncompress.h
drivers/serial/imx.c