]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'linus' into core/locking
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 00:29:17 +0000 (01:29 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 00:29:17 +0000 (01:29 +0100)
1  2 
include/linux/sched.h
mm/vmscan.c

Simple merge
diff --cc mm/vmscan.c
Simple merge