Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Jan 2011 20:24:31 +0000 (15:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Jan 2011 20:24:31 +0000 (15:24 -0500)
commit78d12c237ca2e32ac6570b161d2137b5288c5511
tree673c6ecfc34c7534503be739e0be777ee6422424
parent7c3ee9e3fd065e878a2dbaec9d417441c59799be
parentb955fba29b2082bba8cb94a959a8ec0a375aec8f
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