From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 13 Nov 2006 16:15:30 +0000 (-0800)
Subject: Merge git://oss.sgi.com:8090/xfs/xfs-2.6
X-Git-Tag: v2.6.19-rc6~30
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eea2078eaf2bcd4e5e8b2e08798071efedac5e17;p=linux-2.6

Merge git://oss.sgi.com:8090/xfs/xfs-2.6

* git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Remove KERNEL_VERSION macros from xfs_dmapi.h
  [XFS] Prevent a deadlock when xfslogd unpins inodes.
  [XFS] Clean up i_flags and i_flags_lock handling.
  [XFS] 956664: dm_read_invis() changes i_atime
  [XFS] rename uio_read() to xfs_uio_read()
  [XFS] Keep lockdep happy.
  [XFS] 956618: Linux crashes on boot with XFS-DMAPI filesystem when
---

eea2078eaf2bcd4e5e8b2e08798071efedac5e17