tree b653a5c8c09f7c316f5f98947be262e27a4ca33a
parent 7abbcd6a4c8d6179121f2915a761b1133bf1cd99
parent b1235d79611e78a07629b4cbe53291c9cffd1834
author David S. Miller <davem@davemloft.net> 1216452639 -0700
committer David S. Miller <davem@davemloft.net> 1216452639 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6