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-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6341de0527c26ea1eaf7b7918e1df98f99e1a525;p=openwrt%2Fstaging%2Fblogic.git Merge branches 'upstream' and 'ntrig-multitouch' into for-linus --- 6341de0527c26ea1eaf7b7918e1df98f99e1a525