Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 12 Sep 2007 15:17:30 +0000 (08:17 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 12 Sep 2007 15:17:30 +0000 (08:17 -0700)
commit0bc73c253ebb0430a6b6eb32765aac582fe263c5
tree424026b3487e85fc88e996284f59f3e3867a14ed
parent040a2b6b596f51b0646c9631e29e73559341d5d3
parent1da97f83a843f92678b614fcaebdb3e4ebd6c9dd
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BLUETOOTH]: Fix non-COMPAT build of hci_sock.c