tree c45852727ce4ff7006fc080b95aaf0f6144d2a75
parent d431b2e33cd54e4334019a95979ae93aea4735e8
parent 22408283bca57780bdd53da5a6e4474b71b94430
parent 6cb4b040795c555c7ab4b1ba29b0dba2b5a42beb
parent 23746a66d7d9e73402c68ef00d708796b97ebd72
author Jiri Kosina <jkosina@suse.cz> 1306147765 +0200
committer Jiri Kosina <jkosina@suse.cz> 1306147765 +0200

Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus