Merge branches 'upstream' and 'ntrig-multitouch' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Fri, 12 Jun 2009 15:42:13 +0000 (17:42 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 12 Jun 2009 15:42:13 +0000 (17:42 +0200)

Trivial merge