Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 3 Feb 2009 20:41:58 +0000 (12:41 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Feb 2009 20:41:58 +0000 (12:41 -0800)
commit1725d409caba16ea5fc694bd50e95e79e8ced11a
tree688fe26dd4ceda5364692f0ce307aadb6f04f331
parentb3ff29d2ccfe3af065a9b393699a8fbf2abd1b15
parentb8abde45d7d6ab9e8ceced9b5990eeb1149d0b97
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/iwlwifi/iwl-agn.c
include/linux/pci_ids.h
net/wireless/reg.c