Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 23 Sep 2009 23:23:46 +0000 (16:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Sep 2009 23:23:46 +0000 (16:23 -0700)
commit139d6065c83071d5f66cd013a274a43699f8e2c1
treeb5f0e79e24449ff3284bc5f2f8d3aed041fda108
parentefb064dec6e35618ddc04f3ba49f70e528fbe069
parentb37fa870c7ccb500c7bf6aabc72cefa757da9791
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/b43/main.c