Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
authorJ. Bruce Fields <bfields@citi.umich.edu>
Thu, 4 Mar 2010 17:03:16 +0000 (12:03 -0500)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Thu, 4 Mar 2010 17:04:51 +0000 (12:04 -0500)
commit4ea41e2de5bba756858bb40f964e3490b6d1a25c
tree51a688be321dd42f80d8a0c966eb6a60408d50b3
parent8d75da8afd068fa58b35e69c7c8c46770d9e7a98
parent398007f863a4af2b4a5a07219c5a617f1a098115
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming

Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
fs/nfsd/vfs.c
fs/xfs/linux-2.6/xfs_export.c