summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-06-12 17:42:13 +0200
committerJiri Kosina <jkosina@suse.cz>2009-06-12 17:42:13 +0200
commit6341de0527c26ea1eaf7b7918e1df98f99e1a525 (patch)
tree5f33d7f3d217f06ed67ac4862878e0ad78aa91ff
parentblock: fix kernel-doc in recent block/ changes (diff)
parentHID: fix inverted wheel for bluetooth version of apple mighty mouse (diff)
parentHID: Multitouch support for the N-Trig touchscreen (diff)
downloadlinux-6341de0527c26ea1eaf7b7918e1df98f99e1a525.tar.xz
linux-6341de0527c26ea1eaf7b7918e1df98f99e1a525.zip
Merge branches 'upstream' and 'ntrig-multitouch' into for-linus