author | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 24 Aug 2010 01:30:30 +0000 (18:30 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 24 Aug 2010 01:30:30 +0000 (18:30 -0700) |
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
netfilter: fix CONFIG_COMPAT support
isdn/avm: fix build when PCMCIA is not enabled
header: fix broken headers for user space
e1000e: don't check for alternate MAC addr on parts that don't support it
e1000e: disable ASPM L1 on 82573
ll_temac: Fix poll implementation
netxen: fix a race in netxen_nic_get_stats()
qlnic: fix a race in qlcnic_get_stats()
irda: fix a race in irlan_eth_xmit()
net: sh_eth: remove unused variable
netxen: update version 4.0.74
netxen: fix inconsistent lock state
vlan: Match underlying dev carrier on vlan add
ibmveth: Fix opps during MTU change on an active device
ehea: Fix synchronization between HW and SW send queue
bnx2x: Update bnx2x version to 1.52.53-4
bnx2x: Fix PHY locking problem
rds: fix a leak of kernel memory
netlink: fix compat recvmsg
netfilter: fix userspace header warning
...
netfilter: fix CONFIG_COMPAT support
isdn/avm: fix build when PCMCIA is not enabled
header: fix broken headers for user space
e1000e: don't check for alternate MAC addr on parts that don't support it
e1000e: disable ASPM L1 on 82573
ll_temac: Fix poll implementation
netxen: fix a race in netxen_nic_get_stats()
qlnic: fix a race in qlcnic_get_stats()
irda: fix a race in irlan_eth_xmit()
net: sh_eth: remove unused variable
netxen: update version 4.0.74
netxen: fix inconsistent lock state
vlan: Match underlying dev carrier on vlan add
ibmveth: Fix opps during MTU change on an active device
ehea: Fix synchronization between HW and SW send queue
bnx2x: Update bnx2x version to 1.52.53-4
bnx2x: Fix PHY locking problem
rds: fix a leak of kernel memory
netlink: fix compat recvmsg
netfilter: fix userspace header warning
...
1 | 2 | |||
---|---|---|---|---|
drivers/net/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/net/ehea/ehea.h | patch | | diff1 | | diff2 | | blob | history |
drivers/net/ehea/ehea_main.c | patch | | diff1 | | diff2 | | blob | history |
drivers/net/ll_temac_main.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/ehea/ehea.h
Simple merge
diff --cc drivers/net/ehea/ehea_main.c
Simple merge
diff --cc drivers/net/ll_temac_main.c
Simple merge