Merge branch 'config' into late-for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 13 Oct 2012 16:14:17 +0000 (17:14 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 13 Oct 2012 16:14:17 +0000 (17:14 +0100)

Trivial merge