tree c095f23260dc30d54e023195a6167313efeb9cc9
parent b4a65f4ef59b0ce36ccd518cd2b696afdd932d96
parent 0ff1731a1ae51e8e48cd559d70db536281c47f8e
parent 4875ac114d8bce99838a9b0ee7c3f5469cc6352e
parent 7b2a64c96ad53c4299f7e6ddf8c2f99cb48940a9
parent 61c29f5b1856f90bf0a87d83cfa035a11986d2c5
parent 0ae43810976bc969ee158510c4acbe70ed136e61
parent 5623a24a80814fe471e777f12b9dbbb0f77e002e
author Jiri Kosina <jkosina@suse.cz> 1300368706 +0100
committer Jiri Kosina <jkosina@suse.cz> 1300368706 +0100

Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', 'upstream' and 'upstream-fixes' into for-linus