s Torvalds <torvalds@g5.osdl.org> 1123348728 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1123348728 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
(njQ˜