From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 27 Jun 2005 21:53:48 +0000 (-0700)
Subject: Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3bd19078c215d15e20b4447d9c4aa0065813b207;p=deliverable%2Flinux.git

Merge 'upstream' branch of /linux/kernel/git/jgarzik/misc-2.6
---

3bd19078c215d15e20b4447d9c4aa0065813b207