Merge branch 'linus' into core/locking
authorIngo Molnar <mingo@elte.hu>
Wed, 12 Nov 2008 11:39:21 +0000 (12:39 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 12 Nov 2008 11:39:21 +0000 (12:39 +0100)
commit708b8eae0fd532af73ea8350e6dcc10255ff7376
treef336436934fd79bc91aff7112a9beb10bc4e839f
parentd98d38f2014ab79f28c126ff175d034891f7aefc
parentf21f237cf55494c3a4209de323281a3b0528da10
Merge branch 'linus' into core/locking
include/linux/kernel.h
kernel/lockdep.c
kernel/sched.c