git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b3235fe
42368c3
)
Merge branch 'message-callback' into kbuild/kconfig
author
Michal Marek
<mmarek@suse.cz>
Wed, 27 Oct 2010 22:54:25 +0000
(
00:54
+0200)
committer
Michal Marek
<mmarek@suse.cz>
Wed, 27 Oct 2010 22:54:25 +0000
(
00:54
+0200)
Conflicts:
scripts/kconfig/nconf.c
Trivial merge