diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-28 00:54:25 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-28 00:54:25 +0200 |
| commit | 70c74e59db7450d5c9164abeb3b6752f8045288b (patch) | |
| tree | 1a9b3c6e3c0adee80c7ddc8e86dcf746574fb37b /Kconfig | |
| parent | b3235fe420edf7faf5e8e67b978b12d5524fb161 (diff) | |
| parent | 42368c37fbd51f7b478d041ae55c5df000897158 (diff) | |
| download | linux-70c74e59db7450d5c9164abeb3b6752f8045288b.tar.bz2 | |
Merge branch 'message-callback' into kbuild/kconfig
Conflicts:
scripts/kconfig/nconf.c
Diffstat (limited to 'Kconfig')
0 files changed, 0 insertions, 0 deletions