From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 12 Nov 2014 14:11:15 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
X-Git-Tag: firefly_0821_release~176^2~2691^2~48
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4c7912e9198b141b6cd85999d28b48cb5a037aa0;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/torvalds/linux

Merging 3.18-rc4 in order to pick up the memzero_explicit helper.
---

4c7912e9198b141b6cd85999d28b48cb5a037aa0