From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 25 Feb 2010 16:39:16 +0000 (+0100)
Subject: Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into... 
X-Git-Tag: v2.6.34-rc1~293^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14ef2b0c026558d37662e5e095d59c64597d5769;p=pandora-kernel.git

Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus

Conflicts:
	drivers/hid/Kconfig
---

14ef2b0c026558d37662e5e095d59c64597d5769
Reading git-diff-tree failed