From: David Howells <dhowells@redhat.com>
Date: Tue, 22 Jul 2014 20:55:45 +0000 (+0100)
Subject: Merge branch 'keys-fixes' into keys-next
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~151^2~12^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=633706a2ee81637be37b6bc02c5336950cc163b5;p=pandora-kernel.git

Merge branch 'keys-fixes' into keys-next

Signed-off-by: David Howells <dhowells@redhat.com>
---

633706a2ee81637be37b6bc02c5336950cc163b5
Reading git-diff-tree failed