Merge branch 'for-linus' into for-next
authorTejun Heo <tj@kernel.org>
Tue, 8 Dec 2009 01:02:12 +0000 (10:02 +0900)
committerTejun Heo <tj@kernel.org>
Tue, 8 Dec 2009 01:02:12 +0000 (10:02 +0900)
Conflicts:
mm/percpu.c


Trivial merge