From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 1 May 2006 15:24:37 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.18-rc1~1103^2~25
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2683e88413977a7f382106f8e8b3b684a597c761;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Reverting c7afb48eb5147be9eb9789b4161462d246451ac2 since a better (but
more intrusive) fix is now merged upstream.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

2683e88413977a7f382106f8e8b3b684a597c761