projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
92a5bbc
35da7a3
)
Merge branch 'master' into for-linus
author
Pekka Enberg
<penberg@kernel.org>
Sun, 24 Oct 2010 16:57:05 +0000
(19:57 +0300)
committer
Pekka Enberg
<penberg@kernel.org>
Sun, 24 Oct 2010 16:57:05 +0000
(19:57 +0300)
Conflicts:
include/linux/percpu.h
mm/percpu.c
1
2
lib/Kconfig.debug
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/Kconfig.debug
Simple merge