projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a61944c
1ea3ad4
)
Merge branch 'kconfig-trivial' of git://github.com/lacombar/linux-2.6 into kbuild...
author
Michal Marek
<mmarek@suse.cz>
Wed, 8 Jun 2011 15:40:20 +0000
(17:40 +0200)
committer
Michal Marek
<mmarek@suse.cz>
Wed, 8 Jun 2011 16:03:57 +0000
(18:03 +0200)
1
2
scripts/kconfig/confdata.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
scripts/kconfig/confdata.c
Simple merge