tmp_suning_uos_patched/drivers/net/ehea
David S. Miller 8b3f6af863 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/cpc-usb/TODO
	drivers/staging/cpc-usb/cpc-usb_drv.c
	drivers/staging/cpc-usb/cpc.h
	drivers/staging/cpc-usb/cpc_int.h
	drivers/staging/cpc-usb/cpcusb.h
2009-09-24 15:13:11 -07:00
..
ehea_ethtool.c
ehea_hcall.h
ehea_hw.h
ehea_main.c drivers/net: remove duplicate structure field initialization 2009-09-22 14:00:09 -07:00
ehea_phyp.c net/ehea: use consistant type 2009-01-06 10:47:16 -08:00
ehea_phyp.h
ehea_qmr.c walk system ram range 2009-09-23 07:39:41 -07:00
ehea_qmr.h ehea: Detect 16GB hugepages for firmware restriction 2008-10-27 14:49:55 -04:00
ehea.h ehea: Fix napi list corruption on ifconfig down 2009-08-04 11:48:39 -07:00
Makefile