git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad81f05 508382a)
Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfi...
authorMichal Marek <mmarek@suse.cz>
Tue, 23 Jul 2013 13:57:17 +0000 (15:57 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 23 Jul 2013 13:57:17 +0000 (15:57 +0200)
1  2 
Documentation/kbuild/kconfig.txt patch | diff1 | diff2 | blob | history
scripts/kconfig/mconf.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/kbuild/kconfig.txt
Simple merge
diff --cc scripts/kconfig/mconf.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.