From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 15 Jul 2011 14:05:24 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.1-rc1~316^2~124^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=95a943c162d74b20d869917bdf5df11293c35b63;p=users%2Fjedix%2Flinux-maple.git

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

Conflicts:
	net/bluetooth/l2cap_core.c
---

95a943c162d74b20d869917bdf5df11293c35b63