]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ea991f0 050e714)
Merge git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 13 Nov 2006 16:15:30 +0000 (08:15 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 13 Nov 2006 16:15:30 +0000 (08:15 -0800)
commiteea2078eaf2bcd4e5e8b2e08798071efedac5e17
treee8b9f7ea55f098c6c73d4bdca2794f40ce619476tree | snapshot
parentea991f06d851d58268eac6ce5c2152397757c958commit | diff
parent050e714eb2bc662e9df6bf048ce86b4fbdd9bcd3commit | diff
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
Linux 2.6 source tree