From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 11 Apr 2006 16:51:40 +0000 (-0400)
Subject: Merge branch 'master'
X-Git-Tag: v2.6.18-rc1~1079^2~129
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1;p=linux.git

Merge branch 'master'

Conflicts:

	drivers/scsi/libata-scsi.c
	include/linux/libata.h
---

10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1