]> Git Repo - linux.git/commitdiff
Merge branch 'master' into for-linus
authorPekka Enberg <[email protected]>
Sun, 24 Oct 2010 16:57:05 +0000 (19:57 +0300)
committerPekka Enberg <[email protected]>
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
This page took 0.058764 seconds and 4 git commands to generate.