Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Wed, 30 Dec 2009 21:51:29 +0000 (13:51 -0800)]
1  2 
Documentation/feature-removal-schedule.txt
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/zd1211rw/zd_mac.c

Simple merge
Simple merge