From: James Morris <jmorris@namei.org>
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: v3.3-rc1~105^2^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8077e8b059232f23fe51fdc42868dcd8ba293549;p=pandora-kernel.git

Merge branch 'for-james' of git://github.com/srajiv/tpm into next
---

8077e8b059232f23fe51fdc42868dcd8ba293549
Reading git-diff-tree failed