Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi… · git-mirror/linux@1728943 · GitHub

Commit

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

Browse files

…t/linville/wireless-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-lib.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

Loading branch information

John W. Linville committed Sep 28, 2010

2 parents f2176d7 + e7ee762 commit 1728943