Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 14 Jan 2011 22:17:32 +0000 (22:17 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 14 Jan 2011 22:17:32 +0000 (22:17 +0000)

Trivial merge