Merge branch 'master/kconfig-localmodconfig' of git://github.com/lacombar/linux-2...
Michal Marek [Fri, 19 Aug 2011 14:04:53 +0000 (16:04 +0200)]

Trivial merge