diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 16:01:29 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 16:01:29 (GMT) |
commit | 4699d4423c07a1db35ea9453eac3a07e818338f9 (patch) | |
tree | a16641f1a1ef5d4a03122d58a1a4ff6514d21b4f /drivers/hid/Kconfig | |
parent | 375ac3e09640fb16b6e6f1a1f1ee8aec30183fdf (diff) | |
parent | 4a33821236f2ef3af0081e8a5eec1301cbed3125 (diff) | |
download | linux-fsl-qoriq-4699d4423c07a1db35ea9453eac3a07e818338f9.tar.xz |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: prevent bogus assert when trying to remove non-existent attribute
xfs: clear XFS_IDIRTY_RELEASE on truncate down
xfs: reset inode per-lifetime state when recycling it
Diffstat (limited to 'drivers/hid/Kconfig')
0 files changed, 0 insertions, 0 deletions