From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 28 May 2006 23:35:52 +0000 (-0700)
Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.17-rc6~93
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d9ec5ad24ce80b7ef69a0717363db661d13aada5

Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] the latest consensus libata resume fix
---

d9ec5ad24ce80b7ef69a0717363db661d13aada5