tree f9673afc2332c15a989d3b32f002363a92ea66e1
parent a90c7a313a1c5b4fc99f987a2ae8f92ab0ae35c7
parent bd39a274fb7b43374c797bafdb7f506598f36f77
author John W. Linville <linville@tuxdriver.com> 1302209140 -0400
committer John W. Linville <linville@tuxdriver.com> 1302209140 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
	drivers/net/wireless/rtlwifi/efuse.c
	drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
	net/bluetooth/mgmt.c