Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 23 May 2011 10:49:25 +0000 (12:49 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 23 May 2011 10:49:25 +0000 (12:49 +0200)

Trivial merge