korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-15 10:24:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
871039f02f
linux/drivers/net/can/sja1000
History
David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c
2010-04-11 14:53:53 -07:00
..
ems_pci.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Kconfig can: add support for CAN interface cards based on the PLX90xx PCI bridge 2010-02-03 18:38:41 -08:00
kvaser_pci.c drivers/net/: use DEFINE_PCI_DEVICE_TABLE() 2010-01-07 23:54:26 -08:00
Makefile can: add support for CAN interface cards based on the PLX90xx PCI bridge 2010-02-03 18:38:41 -08:00
plx_pci.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sja1000_isa.c can: sja1000: legacy SJA1000 ISA bus driver 2009-09-04 02:16:16 -07:00
sja1000_of_platform.c net: Fix OF platform drivers coldplug/hotplug when compiled as modules 2009-10-14 14:54:52 -07:00
sja1000_platform.c can: sja1000: add read/write routines for 8, 16 and 32-bit register access 2010-03-21 20:33:37 -07:00
sja1000.c can: netlink support for bus-error reporting and counters 2010-02-26 01:48:49 -08:00
sja1000.h can: make the number of echo skb's configurable 2009-10-13 03:44:04 -07:00