From: James Morris <james.l.morris@oracle.com>
Date: Sat, 26 Jul 2014 00:38:59 +0000 (+1000)
Subject: Merge tag 'keys-next-20140725' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe... 
X-Git-Tag: firefly_0821_release~176^2~2675^2~30
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ed3c4f8f862b9e79bafec3b85cde98c95807821e;p=firefly-linux-kernel-4.4.55.git

Merge tag 'keys-next-20140725' of git://git./linux/kernel/git/dhowells/linux-fs into next
---

ed3c4f8f862b9e79bafec3b85cde98c95807821e