Merge remote-tracking branch 'bluetooth/master'
commit585a682524b23c811e72bdca239288e8774381de
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 02:09:53 +0000 (31 12:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 02:09:53 +0000 (31 12:09 +1000)
tree087a296c9bffc93d84194006b4f49a958b3cb6b1
parent4fc022b00da6c8c1997ad4237cca988eb309e1ea
parent8920047889584998d9e13bcbbc6300bb4f5a8484
Merge remote-tracking branch 'bluetooth/master'