]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92a5bbc 35da7a3)
Merge branch 'master' into for-linus
authorPekka Enberg <penberg@kernel.org>
Sun, 24 Oct 2010 16:57:05 +0000 (19:57 +0300)
committerPekka 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
Clone of davem's net-next-2.6 tree