From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 12 Sep 2007 15:17:30 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: firefly_0821_release~26528
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0bc73c253ebb0430a6b6eb32765aac582fe263c5;p=firefly-linux-kernel-4.4.55.git

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
---

0bc73c253ebb0430a6b6eb32765aac582fe263c5