Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 29 May 2009 19:03:43 +0000 (20:03 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 29 May 2009 19:03:43 +0000 (20:03 +0100)
Conflicts:
arch/arm/Makefile


Trivial merge