Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 7 Aug 2008 08:55:03 +0000 (09:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 7 Aug 2008 08:55:03 +0000 (09:55 +0100)

Trivial merge