tree bc4b414c7eca762c0bac1176bd1d63b74c9f965e
parent 3417ae1f5f59bbf36c3defbbf2a76c5ca498db2a
parent 48573a893303986e3b0b2974d6fb11f3d1bb7064
author Tejun Heo <tj@kernel.org> 1391873834 -0500
committer Tejun Heo <tj@kernel.org> 1391873834 -0500

Merge branch 'for-3.14-fixes' into for-3.15

Pending kernfs conversion depends on fixes in for-3.14-fixes.  Pull it
into for-3.15.

Signed-off-by: Tejun Heo <tj@kernel.org>