From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 2 Apr 2006 14:30:40 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=029f5468b5b5f93a09bf90326fdcb9124079658d;p=pandora-kernel.git

Merge branch 'upstream'

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/pdc_adma.c
	drivers/scsi/sata_mv.c
	drivers/scsi/sata_nv.c
	drivers/scsi/sata_promise.c
	drivers/scsi/sata_qstor.c
	drivers/scsi/sata_sx4.c
	drivers/scsi/sata_vsc.c
	include/linux/libata.h
---

029f5468b5b5f93a09bf90326fdcb9124079658d
Reading git-diff-tree failed