Merge master.kernel.org:/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
This commit is contained in:
Linus Torvalds 2007-09-12 08:17:30 -07:00
commit 0bc73c253e