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: v2.6.31-rc1~342^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6341de0527c26ea1eaf7b7918e1df98f99e1a525;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branches 'upstream' and 'ntrig-multitouch' into for-linus --- 6341de0527c26ea1eaf7b7918e1df98f99e1a525