niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity
288047 commits 2 branches 875 tags 3.5 GiB
Commit graph

3 commits

Author SHA1 Message Date
Jesse Brandeburg
4e0d8f7d97 e1000: convert mdelay to msleep 
With the previous commit, there are several functions
that are only ever called from thread context, and are
able to sleep with msleep instead of mdelay.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Tushar Dave <tushar.n.dave@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 2011-10-06 22:40:05 -07:00
David S. Miller
8decf86879 Merge branch 'master' of github.com:davem330/net 
Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
 2011-09-22 03:23:13 -04:00
Jeff Kirsher
dee1ad47f2 intel: Move the Intel wired LAN drivers 
Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
the necessary Kconfig and Makefile changes.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 2011-08-10 20:03:27 -07:00
Renamed from drivers/net/e1000/e1000_hw.c (Browse further)