Merge branch 'kconfig-trivial' of git://github.com/lacombar/linux-2.6 into kbuild...
Michal Marek [Wed, 8 Jun 2011 15:40:20 +0000 (17:40 +0200)]
1  2 
scripts/kconfig/confdata.c

Simple merge