]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e1b783 f825f0b)
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)
commitf060365e6a09c8f6f5fa21bdfa2dee2f4439754c
treee8b9f7ea55f098c6c73d4bdca2794f40ce619476tree | snapshot
parent1e1b7833bbb35b1e7f7e50337b0040f1e7f75feacommit | diff
parentf825f0b2418c9c19d2df0100ac0641aaed114077commit | 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 Kernel Source Tree.