diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-28 06:04:37 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-28 06:04:37 +0100 |
commit | f496863658eac9054d4bd4c661774d76d83255e0 (patch) | |
tree | 897e967416a204e21d957386514559b2a07a2a9d /fs/xfs/xfs_qm.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
parent | Revert "sysfs: handle duplicate removal attempts in sysfs_remove_group()" (diff) | |
download | linux-f496863658eac9054d4bd4c661774d76d83255e0.tar.xz linux-f496863658eac9054d4bd4c661774d76d83255e0.zip |
Merge tag 'driver-core-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are 3 patches for sysfs issues that have been reported. Well, 1
patch really, the first one is reverted as it's not really needed (the
correct fix is coming in through the different driver subsystems
instead)
But that 1 sysfs fix is needed, so this is still a good thing to pull
in now"
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* tag 'driver-core-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
Revert "sysfs: handle duplicate removal attempts in sysfs_remove_group()"
sysfs: use a separate locking class for open files depending on mmap
sysfs: handle duplicate removal attempts in sysfs_remove_group()
Diffstat (limited to 'fs/xfs/xfs_qm.c')
0 files changed, 0 insertions, 0 deletions