Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Tue, 3 Feb 2009 20:41:58 +0000 (12:41 -0800)]
1  2 
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/iwlwifi/iwl-agn.c
include/linux/pci_ids.h
net/wireless/reg.c

Simple merge
Simple merge
Simple merge