]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ed5759 245dc3d)
Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorArnaldo Carvalho de Melo <acme@mandriva.com>
Fri, 28 Oct 2005 17:49:24 +0000 (15:49 -0200)
committerArnaldo Carvalho de Melo <acme@mandriva.com>
Fri, 28 Oct 2005 17:49:24 +0000 (15:49 -0200)

Trivial merge
Linux 2.6 source tree