]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/actbl.h
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b4cbb19 202dec8)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Apr 2013 02:43:30 +0000 (19:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Apr 2013 02:43:30 +0000 (19:43 -0700)
commit8665ffc9215be1fe56f97500dad0440c9b644f5c
treec1692b1df3b43733d2d6416b39b34ab15ba7eabatree | snapshot
parentb4cbb197c7e7a68dbad0d491242e3ca67420c13ecommit | diff
parent202dec868a769af726e262790bf00b09ec929b52commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "Two small fixups to the Wacom driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wacom - correct reported resolution for Intuos4 Wireless
  Input: wacom - fix "can not retrieve extra class descriptor" for 24HDT
Linux kernel for KaRo TX COM modules