Merge remote-tracking branch 'kconfig/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:52:52 +0000 (11:52 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:52:52 +0000 (11:52 +1000)

Trivial merge