Merge branch 'master' into for-2.6.39
authorTejun Heo <tj@kernel.org>
Mon, 21 Feb 2011 08:43:56 +0000 (09:43 +0100)
committerTejun Heo <tj@kernel.org>
Mon, 21 Feb 2011 08:43:56 +0000 (09:43 +0100)

Trivial merge