diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-28 06:58:09 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-28 06:58:09 +0100 |
commit | 44c3eea650001d85f6adc951b6cd6f2e6fe7a155 (patch) | |
tree | e8a30bec684aba03ae027e428ce6cbd721a6051a /fs/sysfs/dir.c | |
parent | sysfs, kernfs: introduce kernfs_setattr() (diff) | |
parent | Revert "sysfs: handle duplicate removal attempts in sysfs_remove_group()" (diff) | |
download | linux-44c3eea650001d85f6adc951b6cd6f2e6fe7a155.tar.xz linux-44c3eea650001d85f6adc951b6cd6f2e6fe7a155.zip |
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>
Diffstat (limited to 'fs/sysfs/dir.c')
0 files changed, 0 insertions, 0 deletions