]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jul 2010 15:22:40 +0000 (08:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jul 2010 15:22:40 +0000 (08:22 -0700)
commitcc10b6ffd39ef982f86de68d95e5811df82cf819
treecb6f24f40d0211513321b5230b87efc022aeed1f
parent042bd1ff6cf255e71689db913786dbb6bb79542d
parent5b39187fad6faefae5ce1a1e997651d4e382b135
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: w90p910_ts - fix call to setup_timer()
  Input: synaptics - fix wrong dimensions check
  Input: i8042 - mark stubs in i8042.h "static inline"