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 /arch | |
parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | [XFS] cleanup fid types mess (diff) | |
download | linux-dev-f768f9d3757be475a20cb5f9d63bda45934150b1.tar.xz linux-dev-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 'arch')
0 files changed, 0 insertions, 0 deletions