Merge branch 'driver-core-next' into cgroup/for-3.15
authorTejun Heo <tj@kernel.org>
Sat, 8 Feb 2014 15:37:44 +0000 (10:37 -0500)
committerTejun Heo <tj@kernel.org>
Sat, 8 Feb 2014 15:37:44 +0000 (10:37 -0500)
commitf7cef064aa01a1ac682c1945cc168b878cb118ff
tree5dc256a4e01689eed60ab3e7a7ab8e50c5bcf602
parent1a698a4aba26dd58e8409d325a9a9db22f7cd2db
parentba341d55a420ab4fdd1a53fd395fd59bd65de880
Merge branch 'driver-core-next' into cgroup/for-3.15

Pending kernfs conversion depends on kernfs improvements in
driver-core-next.  Pull it into for-3.15.

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