| commit | 24912420e923d56461b400d83f250a31bed8a964 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Nov 19 13:13:47 2010 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Fri Nov 19 13:13:47 2010 -0800 |
| tree | 3bb599e665ed7510df2e3f4c8cb008f7a33f50a9 | |
| parent | 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 [diff] | |
| parent | 0302b8622ce696af1cda22fcf207d3793350e896 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bonding/bond_main.c net/core/net-sysfs.c net/ipv6/addrconf.c