aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-10-25 09:59:04 +0200
committerJiri Kosina <jkosina@suse.cz>2011-10-25 09:59:04 +0200
commitb3aec7b686329e6bb65aa08c7f9458f7fd512f06 (patch)
tree67ae55567b5747f32ddd76dd63621bd2ca756a88 /MAINTAINERS
parentf6f12427844516bc8e9cf84f43aca7bbbaa48157 (diff)
parent1bcc20675a1ac1ba47eaa201e02a89b0508e17b2 (diff)
Merge branch 'upstream' into for-linus
Conflicts: drivers/hid/hid-core.c drivers/hid/hid-ids.h
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions