diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 18:13:36 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 18:13:36 +0100 |
| commit | 8cb280c90f9cfaab3ba3afbace0b1711dee80d0c (patch) | |
| tree | b98d29b0159dd763afab1670d58019b6cb58cfa0 /drivers/net/plip.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg... (diff) | |
| parent | xfs: only run xfs_error_test if error injection is active (diff) | |
| download | linux-8cb280c90f9cfaab3ba3afbace0b1711dee80d0c.tar.xz linux-8cb280c90f9cfaab3ba3afbace0b1711dee80d0c.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: only run xfs_error_test if error injection is active
xfs: avoid moving stale inodes in the AIL
xfs: delayed alloc blocks beyond EOF are valid after writeback
xfs: push stale, pinned buffers on trylock failures
xfs: fix failed write truncation handling.
Diffstat (limited to 'drivers/net/plip.c')
0 files changed, 0 insertions, 0 deletions