From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 7 Apr 2011 20:45:40 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b37e3b6d64358604960b35e8ecbb7aed22e0926e;p=linux-beck.git

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
---

b37e3b6d64358604960b35e8ecbb7aed22e0926e