Merge branch 'driver-core-linus' into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Nov 2013 05:58:09 +0000 (21:58 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Nov 2013 05:58:09 +0000 (21:58 -0800)
We need those sysfs fixes in this branch to make testing, and future
patches apply properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
fs/sysfs/file.c

diff --cc fs/sysfs/file.c
Simple merge