| commit | 70c74e59db7450d5c9164abeb3b6752f8045288b | [log] [tgz] |
|---|---|---|
| author | Michal Marek <mmarek@suse.cz> | Thu Oct 28 00:54:25 2010 +0200 |
| committer | Michal Marek <mmarek@suse.cz> | Thu Oct 28 00:54:25 2010 +0200 |
| tree | 1a9b3c6e3c0adee80c7ddc8e86dcf746574fb37b | |
| parent | b3235fe420edf7faf5e8e67b978b12d5524fb161 [diff] | |
| parent | 42368c37fbd51f7b478d041ae55c5df000897158 [diff] |
Merge branch 'message-callback' into kbuild/kconfig Conflicts: scripts/kconfig/nconf.c