From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 29 May 2005 17:40:13 +0000 (-0700)
Subject: Automatic merge of 'for-linus' branch from
X-Git-Tag: v2.6.12-rc6~92
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b30105e7231b70bb855923dbca443ee3ba44c3;p=linux-2.6

Automatic merge of 'for-linus' branch from

	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input
---

45b30105e7231b70bb855923dbca443ee3ba44c3