diff options
| author |  David S. Miller <davem@davemloft.net>
| 2012-03-01 17:57:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2012-03-01 17:57:40 -0500 |
| commit | b4017c5368f992fb8fb3a2545a0977082c6664e4 (patch) | |
| tree | b18fee77164297141c988965a9846225f8d8b3d3 /init | |
| parent | be2net: Remove unused OFFSET_IN_PAGE() macro (diff) | |
| parent | enic: fix an endian bug in enic_probe() (diff) | |
| download | linux-b4017c5368f992fb8fb3a2545a0977082c6664e4.tar.gz linux-b4017c5368f992fb8fb3a2545a0977082c6664e4.tar.bz2 linux-b4017c5368f992fb8fb3a2545a0977082c6664e4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/tg3.c
Conflicts in the statistics regression bug fix from 'net',
but happily Matt Carlson originally posted the fix against
'net-next' so I used that to resolve this.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions