]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Mar 2009 21:29:03 +0000 (14:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Mar 2009 21:29:03 +0000 (14:29 -0700)
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: only issues a cache flush on unmount if barriers are enabled
  xfs: prevent lockdep false positive in xfs_iget_cache_miss
  xfs: prevent kernel crash due to corrupted inode log format


Trivial merge