Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Sep 2010 20:01:47 +0000 (16:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Sep 2010 20:01:47 +0000 (16:01 -0400)
commit1728943d83e9fd919e454332fe344944123b3c3a
tree76c42bde578332499d3fb77f5cdd110041476cee
parentf2176d7240e4f455a6e007703c7512fbde926dc8
parente7ee762cf074b0fd8eec483d0cef8fdbf0d04b81
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

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