diff options
| author | Jiri Kosina | 2011-03-17 14:31:46 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2011-03-17 14:31:46 +0100 |
| commit | 65b06194c9c9f41bc07ac6a6d42edb4b9e43fea4 (patch) | |
| tree | c095f23260dc30d54e023195a6167313efeb9cc9 | |
| parent | b4a65f4ef59b0ce36ccd518cd2b696afdd932d96 (diff) | |
| parent | 0ff1731a1ae51e8e48cd559d70db536281c47f8e (diff) | |
| parent | 4875ac114d8bce99838a9b0ee7c3f5469cc6352e (diff) | |
| parent | 7b2a64c96ad53c4299f7e6ddf8c2f99cb48940a9 (diff) | |
| parent | 61c29f5b1856f90bf0a87d83cfa035a11986d2c5 (diff) | |
| parent | 0ae43810976bc969ee158510c4acbe70ed136e61 (diff) | |
| parent | 5623a24a80814fe471e777f12b9dbbb0f77e002e (diff) | |
Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', 'upstream' and 'upstream-fixes' into for-linus