diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:46:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:46:05 -0700 |
| commit | 01d61d0d64065b591a3c1502d42b350b10764c54 (patch) | |
| tree | 9fa05149e757d5208820afb446d962e2135f4798 /net/bridge/br_multicast.c | |
| parent | 2e0c17d100c35e843dac1e99daf19b5e2b3fe168 (diff) | |
| parent | e8c3753ce4cd6a805ebcfdb3aa6d30e6f4b8b3e0 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: don't warn about page discards on shutdown
xfs: use scalable vmap API
xfs: remove old vmap cache
Diffstat (limited to 'net/bridge/br_multicast.c')
0 files changed, 0 insertions, 0 deletions