Merge git://oss.sgi.com:8090/oss/git/rc-fixes
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 15 Mar 2006 04:50:45 +0000 (20:50 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 15 Mar 2006 04:50:45 +0000 (20:50 -0800)
* git://oss.sgi.com:8090/oss/git/rc-fixes:
  Fix a direct I/O locking issue revealed by the new mutex code.


Trivial merge