269
parent 856fc004b82ae31846b3037558ec1b2a6286e629
parent 8cc574a3c5cea70229f243a6b57fd69e60491d82
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1175552588 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1175552588 -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]: Fix scsi_send_eh_cmnd scatterlist handling
  [SPARC]: Add unsigned to unused bit field in a.out.h
›T°Z•`x