Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
commitfd9ec7d31ffc36917dc7cac0fd0435f587a572d4
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Sep 2008 09:11:11 +0000 (9 02:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Sep 2008 09:11:11 +0000 (9 02:11 -0700)
tree844da38556f1334959d47bab1d04d0937df8efa5
parent82a28c794f27aac17d7a3ebd7f14d731a11a5532
parente7c29cb16c833441fd2160642bb13025f4e7ac70
Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-2.6