Merge branch 'master' of github.com:davem330/net

[pandora-kernel.git] / drivers / net / ethernet / intel / e1000 / e1000_hw.c

diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
similarity index 100%
rename from drivers/net/e1000/e1000_hw.c
rename to drivers/net/ethernet/intel/e1000/e1000_hw.c