From: Jiri Kosina Date: Fri, 12 Jun 2009 15:42:13 +0000 (+0200) Subject: Merge branches 'upstream' and 'ntrig-multitouch' into for-linus X-Git-Tag: firefly_0821_release~13932^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6341de0527c26ea1eaf7b7918e1df98f99e1a525;p=firefly-linux-kernel-4.4.55.git Merge branches 'upstream' and 'ntrig-multitouch' into for-linus --- 6341de0527c26ea1eaf7b7918e1df98f99e1a525