tree d18903333aae8a4415b179d6e7d38f203724892c
parent bd257ed9f1d129b4e881f513a406b435c8852565
parent f10023a4ef3f5cc05457b059c6880bc447adfa1f
author David S. Miller <davem@davemloft.net> 1237327290 -0700
committer David S. Miller <davem@davemloft.net> 1237327290 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/igb/igb_main.c
	drivers/net/qlge/qlge_main.c
	drivers/net/wireless/ath9k/ath9k.h
	drivers/net/wireless/ath9k/core.h
	drivers/net/wireless/ath9k/hw.c