b0b08f6c14dfd1438f6f6ad49dcd663c9ae5
parent d679f805e7d16291f7671710dd42522561a46611
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1178584542 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1178584542 -0700

Merge master.kernel.org:/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.
N���