From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 02:50:54 +0000 (+1000)
Subject: Merge remote-tracking branch 'bluetooth/master'
X-Git-Tag: next-20130619~66
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=073961da26ffef682ba4d08706b86a56fb854ade;p=karo-tx-linux.git

Merge remote-tracking branch 'bluetooth/master'

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

073961da26ffef682ba4d08706b86a56fb854ade