Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Fri, 26 Dec 2014 23:23:37 +0000 (18:23 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Dec 2014 23:23:37 +0000 (18:23 -0500)
commiteb46e2215fc6bdaaf8eda3a6c7c0dd033d171cad
treee91bb44a445054634c8f0a65311c0285336d483e
parentb63a2a1ff1f7cde479aef091a4b9a9f7238a0657
parent6a8fc95c87110a466ee81675b41170b963f82bdb
Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth

Johan Hedberg says:

====================
Here's one more bluetooth pull request for 3.19. We've got two fixes:

 - Fix for accepting connections with old user space versions of BlueZ
 - Fix for Bluetooth controllers that don't have a public address

Both of these are regressions that were introduced in 3.17, so the
appropriate Cc: stable annotations are provided.

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>