tree 751bec601fb8152116b8e31e0f1f83d687a37d6f
parent dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a
parent 33af88138b859f515b365a074e0a014d7cdbf846
author John W. Linville <linville@tuxdriver.com> 1294261585 -0500
committer John W. Linville <linville@tuxdriver.com> 1294261585 -0500

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

Conflicts:
	net/bluetooth/Makefile