Merge branch 'message-callback' into kbuild/kconfig
authorMichal Marek <mmarek@suse.cz>
Wed, 27 Oct 2010 22:54:25 +0000 (00:54 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 27 Oct 2010 22:54:25 +0000 (00:54 +0200)
Conflicts:
scripts/kconfig/nconf.c


Trivial merge