From: Jaroslav Kysela <perex@hera.kernel.org>
Date: Tue, 21 Jun 2005 14:39:41 +0000 (-0700)
Subject: Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.13-rc1~68^2~583
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fae6ec69c84d71b1d5bda9ede1a262c1681684aa;p=linux-2.6

Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
---

fae6ec69c84d71b1d5bda9ede1a262c1681684aa