summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-29 02:51:02 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-29 02:51:02 +0400
commitc5850150d0b9ae16840c5d9846f9d5a759996a15 (patch)
tree6e3f66bff48916af728aa4173f2b7657b31c2600 /drivers
parent243b422af9ea9af4ead07a8ad54c90d4f9b6081a (diff)
parent0e6e847ffe37436e331c132639f9f872febce82e (diff)
downloadlinux-c5850150d0b9ae16840c5d9846f9d5a759996a15.tar.xz
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: stop using the page cache to back the buffer cache xfs: register the inode cache shrinker before quotachecks xfs: xfs_trans_read_buf() should return an error on failure xfs: introduce inode cluster buffer trylocks for xfs_iflush vmap: flush vmap aliases when mapping fails xfs: preallocation transactions do not need to be synchronous Fix up trivial conflicts in fs/xfs/linux-2.6/xfs_buf.c due to plug removal.
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions