tree ec99640b8d0b12adbfacb85c27683125debd14f2
parent cade455596504fae8e134a27189713ddf7c6d04d
parent 8065248069097dddf9945acfb2081025e9618c16
author John W. Linville <linville@tuxdriver.com> 1334255114 -0400
committer John W. Linville <linville@tuxdriver.com> 1334256119 -0400

Merge branch 'master' into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	net/wireless/nl80211.c