git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4a61f17
038b0a6
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
author
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 4 Oct 2006 16:59:57 +0000
(09:59 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 4 Oct 2006 16:59:57 +0000
(09:59 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
Remove all inclusions of <linux/config.h>
Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.
1
2
mm/slab.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mm/slab.c
Simple merge
git.openpandora.org / pandora-kernel.git / commitdiff