Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 Jan 2008 19:49:31 +0000 (11:49 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 Jan 2008 19:49:31 +0000 (11:49 -0800)
commit460c54b779fce3490ab70a84fd2ef59250ca3d57
tree174f7a702fd765871678aa6ae82ab8f72ed34a67
parent5d0381e21ebf55df88e1cdca2810f4a49fe0ee62
parentaea6ad0ce5e215ce99fe9e3edd9268f696862d8f
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] fix unaligned access in readdir