From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 2 Apr 2007 22:23:08 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.21-rc6~20
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59117d3f4e3f5a7980353d2f476e516c758ce921;p=linux-2.6

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]: Fix scsi_send_eh_cmnd scatterlist handling
  [SPARC]: Add unsigned to unused bit field in a.out.h
---

59117d3f4e3f5a7980353d2f476e516c758ce921