Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/ker…

…nel/git/bluetooth/bluetooth-next
mariux64 · Sep 26, 2014 · 30d3c07 · 30d3c07
2 parents 330bd4e + 565766b
commit 30d3c07
Show file tree

Hide file tree

Showing 12 changed files with 518 additions and 231 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -152,6 +152,7 @@ F:	drivers/scsi/53c700*
 
 6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 M:	Alexander Aring <alex.aring@gmail.com>
+M:	Jukka Rissanen <jukka.rissanen@linux.intel.com>
 L:	linux-bluetooth@vger.kernel.org
 L:	linux-wpan@vger.kernel.org
 S:	Maintained