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)
commit70c74e59db7450d5c9164abeb3b6752f8045288b
tree1a9b3c6e3c0adee80c7ddc8e86dcf746574fb37b
parentb3235fe420edf7faf5e8e67b978b12d5524fb161
parent42368c37fbd51f7b478d041ae55c5df000897158
Merge branch 'message-callback' into kbuild/kconfig

Conflicts:
scripts/kconfig/nconf.c
scripts/kconfig/confdata.c
scripts/kconfig/lkc_proto.h
scripts/kconfig/nconf.c