]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit - arch/mips/sni/reset.c
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 8 Mar 2007 15:28:30 +0000 (07:28 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 8 Mar 2007 15:28:30 +0000 (07:28 -0800)
commit0ce3c83a9c22f59937b86c80b478dfbffe54dbab
tree3c842948d1700ab114fde37249b893b7291ca8a6
parenteee8abe5de9cbd936b51db292c8d3c406b0e79e7
parent3ca5de6dd4ec5a139b2b8f00dce3e4726ca91af1
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
  Input: i8042 - another attempt to fix AUX delivery checks