summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 00:35:42 (GMT)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 00:35:42 (GMT)
commit5b94f675f57e4ff16c8fda09088d7480a84dcd91 (patch)
tree53d311c909a3f333d48ab70d93e8a9010056d498 /include/linux
parentd12db0b08f6c14dfd1438f6f6ad49dcd663c9ae5 (diff)
parentd679f805e7d16291f7671710dd42522561a46611 (diff)
downloadlinux-fsl-qoriq-5b94f675f57e4ff16c8fda09088d7480a84dcd91.tar.xz
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.
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions