tree 6e3f66bff48916af728aa4173f2b7657b31c2600
parent 243b422af9ea9af4ead07a8ad54c90d4f9b6081a
parent 0e6e847ffe37436e331c132639f9f872febce82e
author Linus Torvalds <torvalds@linux-foundation.org> 1301352662 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1301352662 -0700

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.