Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 1 Feb 2011 17:01:27 +0000 (12:01 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 1 Feb 2011 17:01:27 +0000 (12:01 -0500)
commitfa9a741b841d0c2db04875310a06e8718c56fd4f
tree673c6ecfc34c7534503be739e0be777ee6422424
parent7c3ee9e3fd065e878a2dbaec9d417441c59799be
parent479600777bb588724d044815415f7d708d06644b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/wl12xx/spi.c
drivers/net/wireless/ath/ath9k/main.c