summaryrefslogtreecommitdiffstats
path: root/firmware/cis
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-08-04 15:27:54 +0200
committerJiri Kosina <jkosina@suse.cz>2010-08-04 15:27:54 +0200
commit9929ffed889b4861b52ba648a44fa4add945c4d1 (patch)
tree3cca02ae6b6616cc9a204b762aab349fcfa3aefe /firmware/cis
parentfc73697bd5bf4efe8b5b2b78ec09e00f967cd055 (diff)
parentd5e0a06f17a0ffb0eb08a5bd7b18f00af70d9a12 (diff)
Merge branch 'upstream-fixes' into for-linus
Conflicts: drivers/hid/hid-ids.h
Diffstat (limited to 'firmware/cis')
0 files changed, 0 insertions, 0 deletions