From: Linus Torvalds Date: Fri, 4 Aug 2006 00:33:59 +0000 (-0700) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.18-rc4~46 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48;p=pandora-kernel.git Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] ahci: skip protocol test altogether in spurious interrupt code --- efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 Reading git-diff-tree failed