diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-06-12 17:42:13 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-06-12 17:42:13 +0200 |
commit | 6341de0527c26ea1eaf7b7918e1df98f99e1a525 (patch) | |
tree | 5f33d7f3d217f06ed67ac4862878e0ad78aa91ff | |
parent | block: fix kernel-doc in recent block/ changes (diff) | |
parent | HID: fix inverted wheel for bluetooth version of apple mighty mouse (diff) | |
parent | HID: Multitouch support for the N-Trig touchscreen (diff) | |
download | linux-6341de0527c26ea1eaf7b7918e1df98f99e1a525.tar.xz linux-6341de0527c26ea1eaf7b7918e1df98f99e1a525.zip |
Merge branches 'upstream' and 'ntrig-multitouch' into for-linus