| commit | d4185bbf62a5d8d777ee445db1581beb17882a07 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Nov 10 18:32:51 2012 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Sat Nov 10 18:32:51 2012 -0500 |
| tree | 024b0badbd7c970b1983be6d8c345cc4a290cb31 | |
| parent | c075b13098b399dc565b4d53f42047a8d40ed3ba [diff] | |
| parent | a375413311b39005ef281bfd71ae8f4e3df22e97 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>