]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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

Simple merge