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)
commit244acb1ba3777c2eb4d33ddc246cab5419656442
treed2fa55c9f789afb9b1aff57067be1f9190ffc9e7
parentcb8db5d4578ac9d996200ab59aa655344d305f5b
parent93e22567a138783202143c3af70d701a3ad20629
Merge branch 'config' into late-for-linus