diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-30 04:58:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-30 04:58:58 +0200 |
| commit | 92bb062fe36132a04c6dc8b3c51c945730b05224 (patch) | |
| tree | fbce384d5ac6ced74a009b1b8eb212bc1696112b /net/bridge/br_if.c | |
| parent | Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus (diff) | |
| parent | libceph: fix pg_temp mapping update (diff) | |
| download | linux-92bb062fe36132a04c6dc8b3c51c945730b05224.tar.xz linux-92bb062fe36132a04c6dc8b3c51c945730b05224.zip | |
Merge branch 'for-linus' of git://github.com/NewDreamNetwork/ceph-client
* 'for-linus' of git://github.com/NewDreamNetwork/ceph-client:
libceph: fix pg_temp mapping update
libceph: fix pg_temp mapping calculation
libceph: fix linger request requeuing
libceph: fix parse options memory leak
libceph: initialize ack_stamp to avoid unnecessary connection reset
Diffstat (limited to 'net/bridge/br_if.c')
0 files changed, 0 insertions, 0 deletions