From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 4 Sep 2013 08:49:39 +0000 (+0200)
Subject: Merge branch 'master' into for-3.12/upstream
X-Git-Tag: v3.12-rc1~125^2~1^7~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b;p=pandora-kernel.git

Merge branch 'master' into for-3.12/upstream

Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b
Reading git-diff-tree failed