aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-09-13 14:09:41 -0400
committerJiri Kosina <jkosina@suse.cz>2009-09-13 14:09:41 -0400
commit8123e8f7c89a07cb22279b15bf47cdee0205d4a1 (patch)
tree1b6fe7bd51279d7711bb5d856bbd5f6caddd1afb /drivers/hid/Kconfig
parentaffbb8c6e690be2196258e65f3cc92d55b18d9fa (diff)
parent42960a13001aa6df52ca9952ce996f94a744ea65 (diff)
parenta809dda0369ae6157f7bcd3e704b857d43704cbd (diff)
Merge branches 'upstream', 'upstream-fixes' and 'debugfs' into for-linus