Merge branch 'linus' into x86/nmi
[linux-2.6] / scripts / kconfig / images.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2