tree bf319d78c79bb5cb617ff0c8340c73aa349bba15
parent 93c8b90f01f0dc73891da4e84b26524b61d29d66
parent 0523820482dcb42784572ffd2296c2f08c275a2b
author David S. Miller <davem@davemloft.net> 1222866776 -0700
committer David S. Miller <davem@davemloft.net> 1222866776 -0700

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

Conflicts:

	drivers/net/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c