summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-05-23 10:49:25 (GMT)
committerJiri Kosina <jkosina@suse.cz>2011-05-23 10:49:25 (GMT)
commit366a2382c68d01638350efcf23d46a47d661c595 (patch)
treec45852727ce4ff7006fc080b95aaf0f6144d2a75
parentd431b2e33cd54e4334019a95979ae93aea4735e8 (diff)
parent22408283bca57780bdd53da5a6e4474b71b94430 (diff)
parent6cb4b040795c555c7ab4b1ba29b0dba2b5a42beb (diff)
parent23746a66d7d9e73402c68ef00d708796b97ebd72 (diff)
downloadlinux-366a2382c68d01638350efcf23d46a47d661c595.tar.xz
Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus