Merge branch for-3.14/trusted-foundations into for-next

author Stephen Warren <swarren@nvidia.com>

Thu, 19 Dec 2013 20:08:33 +0000 (13:08 -0700)

committer Stephen Warren <swarren@nvidia.com>

Thu, 19 Dec 2013 20:08:33 +0000 (13:08 -0700)
author Stephen Warren <swarren@nvidia.com>
Thu, 19 Dec 2013 20:08:33 +0000 (13:08 -0700)
committer Stephen Warren <swarren@nvidia.com>
Thu, 19 Dec 2013 20:08:33 +0000 (13:08 -0700)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
author	Stephen Warren <swarren@nvidia.com>
	Thu, 19 Dec 2013 20:08:33 +0000 (13:08 -0700)
committer	Stephen Warren <swarren@nvidia.com>
	Thu, 19 Dec 2013 20:08:33 +0000 (13:08 -0700)