From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 8 May 2007 00:35:42 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: MMI-PSA29.97-13-9~43958
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5b94f675f57e4ff16c8fda09088d7480a84dcd91;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SCSI] esp_scsi: Fix section mismatch warnings.
  [VIDEO] sunxvr2500: Fix PCI device ID table.
---

5b94f675f57e4ff16c8fda09088d7480a84dcd91