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

Conflicts:
	include/net/bluetooth/bluetooth.h

2011-11-17 13:11:43 -05:00

..

asm

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

2011-11-17 13:11:43 -05:00