From: Johan Hedberg <johan.hedberg@intel.com>
Date: Thu, 16 Feb 2012 12:23:04 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~727^2~112^2~148
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=46479e698530b8197d601a23317b7c7654195338;p=mirror_ubuntu-zesty-kernel.git

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

Conflicts:
	include/net/bluetooth/l2cap.h
	net/bluetooth/hci_conn.c
	net/bluetooth/l2cap_core.c
---

46479e698530b8197d601a23317b7c7654195338