| commit | eea2078eaf2bcd4e5e8b2e08798071efedac5e17 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Nov 13 08:15:30 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Nov 13 08:15:30 2006 -0800 |
| tree | e8b9f7ea55f098c6c73d4bdca2794f40ce619476 | |
| parent | ea991f06d851d58268eac6ce5c2152397757c958 [diff] | |
| parent | 050e714eb2bc662e9df6bf048ce86b4fbdd9bcd3 [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