Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Wed, 24 Jan 2007 06:02:15 +0000 (22:02 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 24 Jan 2007 06:02:15 +0000 (22:02 -0800)
commit185bd6e2fb1f77e48e4aed50b77edcbf4f08b8fe
tree4492f6613256ab6bdd577ba093da89eab8c4a119
parent2748e5dec7ca8a3804852c7c4171f9156384d15c
parent847641d7db15ac3f18b3d4aa05479812abdf397a
Merge /linux/kernel/git/holtmann/bluetooth-2.6