From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 4 Aug 2010 13:29:35 +0000 (+0200)
Subject: Merge branch 'acrux' into for-linus
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~21186^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd;p=mirror_ubuntu-artful-kernel.git

Merge branch 'acrux' into for-linus

Conflicts:
	drivers/hid/hid-ids.h
---

35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd