Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
authorNathan Scott <nathans@bruce>
Thu, 12 Jan 2006 02:34:47 +0000 (13:34 +1100)
committerNathan Scott <nathans@bruce>
Thu, 12 Jan 2006 02:34:47 +0000 (13:34 +1100)
1  2 
fs/xfs/xfs_iomap.c

Simple merge