| commit | 4b87f922598acf91eee18f71688a33f54f57bcde | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Jan 15 15:05:59 2013 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Jan 15 15:05:59 2013 -0500 |
| tree | 9cdfe30c6b96c47093da5392ed82d147290cd64c | |
| parent | 55eb555d9674e2ebe9d4de0146602f96ff18e7d6 [diff] | |
| parent | daf3ec688e057f6060fb9bb0819feac7a8bbf45c [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>