From: James Morris Date: Wed, 16 Nov 2011 23:08:37 +0000 (+1100) Subject: Merge branch 'for-james' of git://github.com/srajiv/tpm into next X-Git-Tag: firefly_0821_release~3680^2~3757^2^2~13 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=8077e8b059232f23fe51fdc42868dcd8ba293549 Merge branch 'for-james' of git://github.com/srajiv/tpm into next --- 8077e8b059232f23fe51fdc42868dcd8ba293549