OpenCloudOS-Kernel/drivers/net/chelsio
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
Makefile chelsio: sparse warning fixes (old cxgb2) 2007-10-10 16:55:28 -07:00
common.h drivers/net/chelsio: Use pr_<level>, netif_msg_<type> 2010-02-26 01:38:34 -08:00
cphy.h cxgb: set phy's mdio dev before the phy init sequence 2009-05-20 20:51:59 -07:00
cpl5_cmd.h chelsio: spaces, tabs and friends 2007-02-05 16:58:43 -05:00
cxgb2.c drivers/net/chelsio: Use pr_<level>, netif_msg_<type> 2010-02-26 01:38:34 -08:00
elmer0.h chelsio: spaces, tabs and friends 2007-02-05 16:58:43 -05:00
espi.c drivers/net/chelsio: Use pr_<level>, netif_msg_<type> 2010-02-26 01:38:34 -08:00
espi.h drivers/net/chelsio/: #if 0 unused functions 2008-01-28 15:03:59 -08:00
fpga_defs.h chelsio: spaces, tabs and friends 2007-02-05 16:58:43 -05:00
gmac.h chelsio: use const for virtual functions 2007-04-28 11:00:56 -04:00
mv88e1xxx.c cxgb: set phy's mdio dev before the phy init sequence 2009-05-20 20:51:59 -07:00
mv88e1xxx.h
mv88x201x.c cxgb: set phy's mdio dev before the phy init sequence 2009-05-20 20:51:59 -07:00
my3126.c cxgb: set phy's mdio dev before the phy init sequence 2009-05-20 20:51:59 -07:00
pm3393.c drivers/net/chelsio: Use pr_<level>, netif_msg_<type> 2010-02-26 01:38:34 -08:00
regs.h
sge.c Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
sge.h netdev: convert bulk of drivers to netdev_tx_t 2009-09-01 01:14:07 -07:00
subr.c drivers/net/chelsio: Use pr_<level>, netif_msg_<type> 2010-02-26 01:38:34 -08:00
suni1x10gexp_regs.h chelsio parenthesis fix 2007-05-24 17:37:00 -04:00
tp.c chelsio: spaces, tabs and friends 2007-02-05 16:58:43 -05:00
tp.h
vsc7326.c drivers/net/chelsio: Use pr_<level>, netif_msg_<type> 2010-02-26 01:38:34 -08:00
vsc7326_reg.h chelsio: tabulate the update of the statistic counters 2007-02-05 16:58:43 -05:00