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: firefly_0821_release~42717^2~236
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=45b30105e7231b70bb855923dbca443ee3ba44c3;p=firefly-linux-kernel-4.4.55.git

Automatic merge of 'for-linus' branch from

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

45b30105e7231b70bb855923dbca443ee3ba44c3