summaryrefslogtreecommitdiff
path: root/arch/s390/include/asm/cpu.h
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2012-05-15 11:21:26 +0400
committerHerbert Xu <herbert@gondor.apana.org.au>2012-05-15 11:21:26 +0400
commitb29e2679d0da91c60d3ac190d9c3bd65ac2f68c5 (patch)
tree518ec8f4bfd316e91bcc30f434edb78529557eba /arch/s390/include/asm/cpu.h
parent8a63b1994c500d4825ee73dc71502deffe5b135b (diff)
parent4bb2d1009f671815870e8f78e826e4f9071392a7 (diff)
downloadlinux-b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to add prerequisite for ARM ux500 crypto support.
Diffstat (limited to 'arch/s390/include/asm/cpu.h')
0 files changed, 0 insertions, 0 deletions