1f5891b10a861f2c parent 2411054ae9eb7e7ef488a39912abfc4ebadbe3ad parent adb08edea0119f7a5484a9f6a385fbcecdf85a63 author John W. Linville 1281038068 -0400 committer John W. Linville 1281038068 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6 ûúxÍš