summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-10-03 00:47:02 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-10-03 00:47:02 +0400
commitd5d16892243e7755da706d03b34da85ea6a74117 (patch)
tree35923f150cf6d9130abda2ef6b65a9719ad38155 /crypto
parent3467e765a59241f8b0e488f4a6ef183547181f35 (diff)
parentad684dce87fac52738649e62b4afa25081b52a28 (diff)
parentf3354ab67476dc800463df32e33423158003d80b (diff)
parent421520ba98290a73b35b7644e877a48f18e06004 (diff)
downloadlinux-d5d16892243e7755da706d03b34da85ea6a74117.tar.xz
Merge branches 'fiq' (early part), 'fixes', 'l2c' (early part) and 'misc' into for-next