Merge branch 'master' into percpu
authorTejun Heo <tj@kernel.org>
Tue, 2 Feb 2010 05:38:15 +0000 (14:38 +0900)
committerTejun Heo <tj@kernel.org>
Tue, 2 Feb 2010 05:38:15 +0000 (14:38 +0900)

Trivial merge