Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes', 'wacom...
authorJiri Kosina <jkosina@suse.cz>
Thu, 5 Jan 2012 14:51:02 +0000 (15:51 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 5 Jan 2012 14:51:02 +0000 (15:51 +0100)

Trivial merge