From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 01:59:17 +0000 (+1000)
Subject: Merge remote-tracking branch 'wireless-next/master'
X-Git-Tag: next-20120430~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=749993d2268ab0192c3402ea8a700700bc43f3e8;p=karo-tx-linux.git

Merge remote-tracking branch 'wireless-next/master'

Conflicts:
	net/bluetooth/hci_core.c
	net/bluetooth/mgmt.c
---

749993d2268ab0192c3402ea8a700700bc43f3e8