Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 Jun 2009 21:32:08 +0000 (14:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Jun 2009 21:32:08 +0000 (14:32 -0700)
commitfc23ffe075365d2f21b1046048ad0d342bbb41be
tree164889c120908fbfeae36790f7bbee0271a30873
parentcf9f6e21c155d5add733b969c695837ead79eeab
parent4c713189485dbea875aecd1990daed74908e181d
Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-2.6