| commit | f48ecb19bc0443a4272dd0934e7bee4480610df9 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Nov 18 15:13:26 2014 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Nov 18 15:13:26 2014 -0500 |
| tree | eb29c8f7491e0fbf93e0c722a4b3feb575fc93c3 | |
| parent | 47b6308b643302e642ca2a5cb6470926f7e1c428 [diff] | |
| parent | a86c02ea38c53b695209b1181f9e2e18d73eb4e8 [diff] |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next Johan Hedberg <johan.hedberg@gmail.com> says: "Here's another bluetooth-next pull request for 3.19. We've got: - Various fixes, cleanups and improvements to ieee802154/mac802154 - Support for a Broadcom BCM20702A1 variant - Lots of lockdep fixes - Fixed handling of LE CoC errors that should trigger SMP" Signed-off-by: John W. Linville <linville@tuxdriver.com>