]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'kconfig/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 20 Nov 2011 23:55:38 +0000 (10:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 20 Nov 2011 23:55:38 +0000 (10:55 +1100)

Trivial merge