Merge branches 'device-groups', 'logitech' and 'multitouch' into for-linus
commitb3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e
authorJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:29:23 +0000 (22 11:29 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:29:23 +0000 (22 11:29 +0200)
treec1766259ad622bfde87fe38f72be81bbefc49096
parentb565a3906a92fe87b162cdcd11268589a36dc6dd
parentc6e6dc87b306b897abc8a8b1c6ca05aa72317249
parent3ac36d15557d1bedfb1151d9911b9587b2d40759
Merge branches 'device-groups', 'logitech' and 'multitouch' into for-linus