diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 11:55:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 11:55:50 -0700 |
| commit | f768f9d3757be475a20cb5f9d63bda45934150b1 (patch) | |
| tree | b9e5ab5ba84c8434a702723ab80ac6f0f990ce23 /fs/lockd | |
| parent | 804b908adfcffe3831621acb6c8a776585983d2a (diff) | |
| parent | c6143911a7e0f8abef0319c801eb36718f57dfde (diff) | |
| download | blackbird-op-linux-f768f9d3757be475a20cb5f9d63bda45934150b1.tar.gz blackbird-op-linux-f768f9d3757be475a20cb5f9d63bda45934150b1.zip | |
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] cleanup fid types mess
[XFS] fixups after behavior removal merge into mainline git
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions
