From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 23 Jun 2006 02:11:56 +0000 (-0400)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.18-rc1~1079^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71d530cd1b6d97094481002a04c77fea1c8e1c22;p=pandora-kernel.git

Merge branch 'master' into upstream

Conflicts:

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

71d530cd1b6d97094481002a04c77fea1c8e1c22
Reading git-diff-tree failed