diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 09:01:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 09:01:29 -0700 |
| commit | 4699d4423c07a1db35ea9453eac3a07e818338f9 (patch) | |
| tree | a16641f1a1ef5d4a03122d58a1a4ff6514d21b4f /include/linux/timerqueue.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (diff) | |
| parent | xfs: prevent bogus assert when trying to remove non-existent attribute (diff) | |
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 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions