summaryrefslogtreecommitdiffstats
path: root/arch/mips/sni/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-18 15:29:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-18 15:29:38 -0700
commitd1126ad907ce197ff45fbc2369fbeaf8ae6f75a8 (patch)
tree59204d2c9d41f6d43119ff0750077dcc2223929e /arch/mips/sni/Makefile
parent2a554736f0d518b7c4d9939c6a6842bffebc7475 (diff)
parent83e4491818040ae6b2d9fc60434616304a101d39 (diff)
downloadlinux-d1126ad907ce197ff45fbc2369fbeaf8ae6f75a8.tar.gz
linux-d1126ad907ce197ff45fbc2369fbeaf8ae6f75a8.tar.bz2
linux-d1126ad907ce197ff45fbc2369fbeaf8ae6f75a8.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: USB HID: Add ID for eGalax Multitouch used in JooJoo tablet HID: hiddev: fix memory corruption due to invalid intfdata HID: hiddev: protect against disconnect/NULL-dereference race HID: picolcd: correct ordering of framebuffer freeing HID: picolcd: testing the wrong variable
Diffstat (limited to 'arch/mips/sni/Makefile')
0 files changed, 0 insertions, 0 deletions