summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 17:02:08 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 17:02:08 -0800
commit4222721ebb50a8640860eeca0caeb63fe1cce935 (patch)
treed67acdb4315e611fadc64975fd1467b2389d412d /Makefile
parent41c57a87183a7c458d86f78966d69d4bf18ea0b7 (diff)
parent76398f9667e8369023ed5f4847fb59e9da8b6968 (diff)
downloadop-kernel-dev-4222721ebb50a8640860eeca0caeb63fe1cce935.zip
op-kernel-dev-4222721ebb50a8640860eeca0caeb63fe1cce935.tar.gz
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: HID: fix pb_fnmode and move it to generic HID HID: fix hid-input mapping for Firefly Mini Remote Control USB HID: fix hid_blacklist clash for 0x08ca/0x0010 HID: fix memleaking of collection
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud