Merge branch 'for-linus' into for-next
commit50de1a8ef18da0cfff97543315b4e042e8bb7c83
authorTejun Heo <tj@kernel.org>
Tue, 8 Dec 2009 01:02:12 +0000 (8 10:02 +0900)
committerTejun Heo <tj@kernel.org>
Tue, 8 Dec 2009 01:02:12 +0000 (8 10:02 +0900)
tree86056d1aef0e83d7839a8350c9e6109b80b3cfa5
parent390dfd95c5df1ab3921dd388d11b2aee332c3f2c
parentee0a6efc1897ef817e177e669f5c5d211194df24
Merge branch 'for-linus' into for-next

Conflicts:
mm/percpu.c
include/linux/percpu.h
kernel/sched.c
mm/percpu.c