From: James Morris <james.l.morris@oracle.com>
Date: Thu, 15 Jan 2015 00:30:54 +0000 (+1100)
Subject: Merge tag 'keys-next-fixes-20150114' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~2350^2~52
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bb31f607a0900552926ebf9ef3d002d96a43f7cc;p=firefly-linux-kernel-4.4.55.git

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

bb31f607a0900552926ebf9ef3d002d96a43f7cc