tree 53a8c47d67dfcd23450d4068d08ccf2b7714c5e8
parent 2da45db2bdd432a9dca825099c791f5c851f92b9
parent 5ee31c6898ea5537fcea160999d60dc63bc0c305
author David S. Miller <davem@davemloft.net> 1339563558 -0700
committer David S. Miller <davem@davemloft.net> 1339563558 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	MAINTAINERS
	drivers/net/wireless/iwlwifi/pcie/trans.c

The iwlwifi conflict was resolved by keeping the code added
in 'net' that turns off the buggy chip feature.

The MAINTAINERS conflict was merely overlapping changes, one
change updated all the wireless web site URLs and the other
changed some GIT trees to be Johannes's instead of John's.

Signed-off-by: David S. Miller <davem@davemloft.net>