Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 30 Dec 2009 21:51:29 +0000 (13:51 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Dec 2009 21:51:29 +0000 (13:51 -0800)
commit3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8
treeb0ad8d03710ee556e97515ba1c949233859391ce
parent6cd9b49d7328c4656bfc17fcb47fb814955d40d2
parent891dc5e73783eeabd2a704a9425e2a199b39c9f9
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
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