Merge branch 'master' into export-slabh
authorTejun Heo <tj@kernel.org>
Mon, 5 Apr 2010 02:37:28 +0000 (11:37 +0900)
committerTejun Heo <tj@kernel.org>
Mon, 5 Apr 2010 02:37:28 +0000 (11:37 +0900)

Trivial merge