Merge branch 'master' into upstream
authorJiri Kosina <jkosina@suse.cz>
Fri, 10 Dec 2010 14:19:18 +0000 (15:19 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 10 Dec 2010 14:19:18 +0000 (15:19 +0100)
commit2ade0c1d9d93b7642212657ef76f4a1e30233711
tree63bc720c0ffe5f4760cac4ed617b9870b050175e
parent504499f22c08a03e2e19dc88d31aa0ecd2ac815e
parent6313e3c21743cc88bb5bd8aa72948ee1e83937b6
Merge branch 'master' into upstream
drivers/hid/hid-core.c
drivers/hid/hid-egalax.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-tmff.c
drivers/hid/hidraw.c
drivers/hid/usbhid/hiddev.c