tree 174f7a702fd765871678aa6ae82ab8f72ed34a67
parent 5d0381e21ebf55df88e1cdca2810f4a49fe0ee62
parent aea6ad0ce5e215ce99fe9e3edd9268f696862d8f
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1200080971 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1200080971 -0800

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