From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 15 May 2012 07:21:26 +0000 (+1000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
X-Git-Tag: for-linus-20120531~87^2~5
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5;p=linux-2.6-block.git

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

Merge mainline to add prerequisite for ARM ux500 crypto support.
---

b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5