proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-12-07 17:03:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2fae5e3670
mirror_ubuntu-kernels/drivers/net/ethernet/ti
History
David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-02-26 21:55:51 -05:00
..
cpmac.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-19 16:03:15 -05:00
davinci_cpdma.c davinci_cpdma: Fix channel number written to teardown registers 2012-02-24 03:23:37 -05:00
davinci_cpdma.h davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers 2011-08-12 03:41:10 -07:00
davinci_emac.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-26 21:55:51 -05:00
davinci_mdio.c davinci_mdio: Correct bitmask for clock divider value 2012-02-24 03:24:18 -05:00
Kconfig drivers/net/ethernet/*: Enabled vendor Kconfig options 2011-08-27 00:58:56 -07:00
Makefile davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers 2011-08-12 03:41:10 -07:00
tlan.c drivers/net: Remove alloc_etherdev error messages 2012-01-31 16:20:48 -05:00
tlan.h davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers 2011-08-12 03:41:10 -07:00