From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Sun, 2 Apr 2006 05:08:05 +0000 (-0500)
Subject: Manual merge with Linus.
X-Git-Tag: v2.6.17-rc1~15^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95d465fd750897ab32462a6702fbfe1b122cbbc0;p=pandora-kernel.git

Manual merge with Linus.

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c
---

95d465fd750897ab32462a6702fbfe1b122cbbc0
Reading git-diff-tree failed