From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 24 Mar 2006 17:29:39 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99;p=pandora-kernel.git

Merge branch 'upstream'

Conflicts:

	drivers/scsi/libata-core.c
---

4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99
Reading git-diff-tree failed