From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Apr 2008 18:23:05 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.25-rc8~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3344203948f40521c35a0a52e3f1bd9fbb7a1118;p=users%2Fjedix%2Flinux-maple.git

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: make sure input interfaces pin parent input devices
  Input: apm-power - fix crash when unloading modules
  Input: pxa27x - fix keypad KPC macros
---

3344203948f40521c35a0a52e3f1bd9fbb7a1118