7333a0a935109aff0583
parent 872f24dbc604ef585ea7eec73020dcdfaffd1956
parent 94c514fe240fc0dd02187b78facefde8b6744634
author John W. Linville <linville@tuxdriver.com> 1335467028 -0400
committer John W. Linville <linville@tuxdriver.com> 1335467028 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
�g���"x