Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Apr 2008 22:41:32 +0000 (15:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Apr 2008 22:41:32 +0000 (15:41 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: appletouch - add product IDs for the 4th generation MacBooks


Trivial merge