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)
commit44c3eea650001d85f6adc951b6cd6f2e6fe7a155
treee8a30bec684aba03ae027e428ce6cbd721a6051a
parent5d60418e54751c856f5aecc308620fde9572e481
parent81440e73744446adbe5b5d1f19460203d275028f
Merge branch 'driver-core-linus' into driver-core-next

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>
fs/sysfs/file.c