diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-07 16:13:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-07 16:13:54 -0800 |
| commit | a694ad94bce2a0287136043e25cff856ce3a1007 (patch) | |
| tree | 56cc4ee94f0358a082b1bcba8270fe30b9aa1de0 /include/linux/timerqueue.h | |
| parent | Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | xfs: fix the logspace waiting algorithm (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: fix the logspace waiting algorithm
xfs: fix nfs export of 64-bit inodes numbers on 32-bit kernels
xfs: fix allocation length overflow in xfs_bmapi_write()
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions