]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'upstream' and 'multitouch' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 16 Aug 2011 09:39:19 +0000 (11:39 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 16 Aug 2011 09:39:19 +0000 (11:39 +0200)

Trivial merge