Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', ...
authorJiri Kosina <jkosina@suse.cz>
Thu, 17 Mar 2011 13:31:46 +0000 (14:31 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 17 Mar 2011 13:31:46 +0000 (14:31 +0100)
commit65b06194c9c9f41bc07ac6a6d42edb4b9e43fea4
treec095f23260dc30d54e023195a6167313efeb9cc9
parentb4a65f4ef59b0ce36ccd518cd2b696afdd932d96
parent0ff1731a1ae51e8e48cd559d70db536281c47f8e
parent4875ac114d8bce99838a9b0ee7c3f5469cc6352e
parent7b2a64c96ad53c4299f7e6ddf8c2f99cb48940a9
parent61c29f5b1856f90bf0a87d83cfa035a11986d2c5
parent0ae43810976bc969ee158510c4acbe70ed136e61
parent5623a24a80814fe471e777f12b9dbbb0f77e002e
Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', 'upstream' and 'upstream-fixes' into for-linus
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-multitouch.c
drivers/hid/hidraw.c
include/linux/hid.h
net/bluetooth/hidp/core.c