Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
a7e0e4e99f
linux/drivers/net/ethernet
History
Jiri Kosina e75d660672 Merge branch 'master' into for-next 
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c
2012-04-08 21:48:52 +02:00
..
3com Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
8390 Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
adaptec netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-06 11:41:20 -05:00
adi adi: adapt to eth_hw_addr_random() and changes in arch/blackfin 2012-02-19 19:03:04 -05:00
aeroflex ethernet: unify return value of .ndo_set_mac_address if address is invalid 2012-02-23 17:03:20 -05:00
alteon Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
amd Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
apple netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-08 18:46:38 -05:00
atheros atlx: Use ETH_ALEN 2012-03-19 16:53:08 -04:00
broadcom bnx2x: Clear MDC/MDIO warning message 2012-04-04 18:24:23 -04:00
brocade Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-03-21 13:36:41 -07:00
cadence net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
calxeda net: use eth_hw_addr_random() and reset addr_assign_type 2012-02-15 15:34:17 -05:00
chelsio simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
cirrus Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
cisco enic: Fix addr valid check in enic_set_vf_mac 2012-03-08 00:28:19 -08:00
davicom net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
dec dec/tulip/de4x5: print MAC via printk format specifier 2012-02-24 15:40:59 -05:00
dlink Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
emulex be2net: fix programming of VLAN tags for VF 2012-03-19 16:52:17 -04:00
faraday net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
freescale Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-02 17:53:39 -07:00
fujitsu Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
hp netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-06 11:52:27 -05:00
i825xx Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
ibm powerpc+sparc/vio: Modernize driver registration 2012-03-28 11:33:24 +11:00
icplus netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-06 11:52:27 -05:00
intel e1000e: Guarantee descriptor writeback flush success. 2012-04-03 15:25:16 -07:00
marvell sky2: copy received packets on inefficient unaligned architecture 2012-04-04 18:14:04 -04:00
mellanox mlx4: allocate just enough pages instead of always 4 pages 2012-04-04 20:34:29 -04:00
micrel Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
microchip net: use eth_hw_addr_random() and reset addr_assign_type 2012-02-15 15:34:17 -05:00
myricom drivers/net: Remove alloc_etherdev error messages 2012-01-31 16:20:48 -05:00
natsemi Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
neterion Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
nuvoton netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-08 18:46:38 -05:00
nvidia Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
nxp net: lpc_eth: Fix rename of dev_hw_addr_random 2012-04-01 16:47:12 -04:00
octeon octeon: fix PHY name to match MDIO bus name 2012-02-13 16:04:09 -05:00
oki-semi net/pch_gbe: supports eg20t ptp clock 2012-03-09 13:55:38 -08:00
packetengines Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-03-05 21:16:26 -05:00
pasemi ethernet: unify return value of .ndo_set_mac_address if address is invalid 2012-02-23 17:03:20 -05:00
qlogic qlcnic: Bug fix for LRO 2012-03-23 14:51:31 -04:00
racal netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-08 18:46:38 -05:00
rdc net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
realtek Merge branch 'master' into for-next 2012-04-08 21:48:52 +02:00
renesas net: sh_eth: fix endian check for architecture independent 2012-04-01 23:22:11 -04:00
seeq Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
sfc MTD merge for 3.4 2012-03-30 17:31:56 -07:00
sgi net: meth: Add set_rx_mode hook to fix ICMPv6 neighbor discovery 2011-12-27 13:17:34 -05:00
silan
sis net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
smsc Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
stmicro stmmac: re-add IFF_UNICAST_FLT for dwmac1000 2012-04-04 18:38:31 -04:00
sun Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
tehuti netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-08 18:46:38 -05:00
ti cpsw: Hook up default ndo_change_mtu. 2012-03-20 00:33:59 -04:00
tile drivers/net/ethernet/tile: fix netdev_alloc_skb() bombing 2012-04-02 13:17:37 -04:00
toshiba net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
tundra Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
via via-rhine: fix wait-bit inversion. 2012-04-01 23:09:36 -04:00
xilinx ll_temac: Fix build. 2012-02-20 00:46:06 -05:00
xircom Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
xscale xscale/ixp2000/ixpdev: print MAC via printk format specifier 2012-02-24 15:41:00 -05:00
dnet.c net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
dnet.h
ethoc.c ethoc: set addr_assign_type if random_ether_addr() used 2012-02-17 15:58:06 -05:00
fealnx.c netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-06 11:48:09 -05:00
jme.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-26 21:55:51 -05:00
jme.h jme: Fix FIFO flush issue 2012-02-22 14:44:41 -05:00
Kconfig lpc32xx: Added ethernet driver 2012-03-12 17:08:34 -07:00
korina.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
lantiq_etop.c ethernet: Fix typo in lantiq_etop.c 2012-02-19 19:02:42 -05:00
Makefile lpc32xx: Added ethernet driver 2012-03-12 17:08:34 -07:00
mipsnet.c net: replace random_ether_addr() with eth_hw_addr_random() 2012-02-15 15:34:16 -05:00
netx-eth.c netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-08 18:46:38 -05:00
s6gmac.c netdev: ethernet dev_alloc_skb to netdev_alloc_skb 2012-02-08 18:46:38 -05:00