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)
commit5b94f675f57e4ff16c8fda09088d7480a84dcd91
tree53d311c909a3f333d48ab70d93e8a9010056d498
parentd12db0b08f6c14dfd1438f6f6ad49dcd663c9ae5
parentd679f805e7d16291f7671710dd42522561a46611
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.