summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-05-22 09:32:31 (GMT)
committerJiri Kosina <jkosina@suse.cz>2012-05-22 09:32:31 (GMT)
commit56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch)
tree195cdd3973a1288eb84f51f0ec28a947b333c2c5 /arch/arm
parentb3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e (diff)
parentd1257081aecf44455fcab8675f1d54e8b242faa1 (diff)
downloadlinux-fsl-qoriq-56ccd186f1837dd418cd094f0e96b3196bbab9ef.tar.xz
Merge branch 'upstream' into for-linus
Conflicts: drivers/hid/hid-core.c
Diffstat (limited to 'arch/arm')
0 files changed, 0 insertions, 0 deletions