Merge branch 'kconfig/for-next' of git://github.com/lacombar/linux-2.6 into kbuild...
Michal Marek [Wed, 31 Aug 2011 10:06:36 +0000 (12:06 +0200)]

Trivial merge