Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 22 Nov 2011 20:44:19 +0000 (20:44 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 22 Nov 2011 20:44:19 +0000 (20:44 +0000)

Trivial merge