Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 2 Apr 2007 22:23:08 +0000 (15:23 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 2 Apr 2007 22:23:08 +0000 (15:23 -0700)
commit59117d3f4e3f5a7980353d2f476e516c758ce921
treedbc12a55f0e1c46205acbc88bda35b96ad4b1269
parent856fc004b82ae31846b3037558ec1b2a6286e629
parent8cc574a3c5cea70229f243a6b57fd69e60491d82
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SCSI]: Fix scsi_send_eh_cmnd scatterlist handling
  [SPARC]: Add unsigned to unused bit field in a.out.h