From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 1 Oct 2012 12:37:51 +0000 (+0200)
Subject: Merge branch 'upstream' into for-linus
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~104^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3cbe10e474ac8c2c30a151a7812e15e4cfa2775;p=pandora-kernel.git

Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/usbhid/hid-quirks.c
---

a3cbe10e474ac8c2c30a151a7812e15e4cfa2775
Reading git-diff-tree failed