From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 28 Jun 2005 17:20:11 +0000 (-0700)
Subject: Merge head 'upstream-20050628-1' of rsync://rsync.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.13-rc1~45
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=61998bcb4bf0efa0276e88c7853091e482a826f4;p=powerpc.git

Merge head 'upstream-20050628-1' of /linux/kernel/git/jgarzik/libata-dev
---

61998bcb4bf0efa0276e88c7853091e482a826f4