Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 May 2007 00:35:42 +0000 (17:35 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 May 2007 00:35:42 +0000 (17:35 -0700)
* 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.


Trivial merge