| commit | 1e4b1057121bc756b91758a434b504d2010f6088 | [log] [tgz] |
|---|---|---|
| author | Patrick McHardy <kaber@trash.net> | Mon May 10 18:39:28 2010 +0200 |
| committer | Patrick McHardy <kaber@trash.net> | Mon May 10 18:39:28 2010 +0200 |
| tree | b016cf2c728289c7e36d9e4e488f30ab0bd0ae6e | |
| parent | 3b254c54ec46eb022cb26ee6ab37fae23f5f7d6a [diff] | |
| parent | 3ee943728fff536edaf8f59faa58aaa1aa7366e3 [diff] |
Merge branch 'master' of /repos/git/net-next-2.6 Conflicts: net/bridge/br_device.c net/bridge/br_forward.c Signed-off-by: Patrick McHardy <kaber@trash.net>