From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 5 Jan 2011 21:06:25 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.38-rc1~476^2~14^2~3
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=c96e96354a6c9456cdf1f150eca504e2ea35301e

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

Conflicts:
	net/bluetooth/Makefile
---

c96e96354a6c9456cdf1f150eca504e2ea35301e