Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 13 Mar 2009 21:44:51 +0000 (21:44 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 13 Mar 2009 21:44:51 +0000 (21:44 +0000)
Conflicts:

arch/arm/mach-at91/gpio.c


Trivial merge