summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-05-22 11:29:23 +0200
committerJiri Kosina <jkosina@suse.cz>2012-05-22 11:29:23 +0200
commitb3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e (patch)
treec1766259ad622bfde87fe38f72be81bbefc49096
parentb565a3906a92fe87b162cdcd11268589a36dc6dd (diff)
parentc6e6dc87b306b897abc8a8b1c6ca05aa72317249 (diff)
parent3ac36d15557d1bedfb1151d9911b9587b2d40759 (diff)
Merge branches 'device-groups', 'logitech' and 'multitouch' into for-linus