remarkable-linux/arch/powerpc/configs
Linus Torvalds d66e6737d4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto update from Herbert Xu:
 - Optimised AES/SHA1 for ARM.
 - IPsec ESN support in talitos and caam.
 - x86_64/avx implementation of cast5/cast6.
 - Add/use multi-algorithm registration helpers where possible.
 - Added IBM Power7+ in-Nest support.
 - Misc fixes.

Fix up trivial conflicts in crypto/Kconfig due to the sparc64 crypto
config options being added next to the new ARM ones.

[ Side note: cut-and-paste duplicate help texts make those conflicts
  harder to read than necessary, thanks to git being smart about
  minimizing conflicts and maximizing the common parts... ]

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (71 commits)
  crypto: x86/glue_helper - fix storing of new IV in CBC encryption
  crypto: cast5/avx - fix storing of new IV in CBC encryption
  crypto: tcrypt - add missing tests for camellia and ghash
  crypto: testmgr - make test_aead also test 'dst != src' code paths
  crypto: testmgr - make test_skcipher also test 'dst != src' code paths
  crypto: testmgr - add test vectors for CTR mode IV increasement
  crypto: testmgr - add test vectors for partial ctr(cast5) and ctr(cast6)
  crypto: testmgr - allow non-multi page and multi page skcipher tests from same test template
  crypto: caam - increase TRNG clocks per sample
  crypto, tcrypt: remove local_bh_disable/enable() around local_irq_disable/enable()
  crypto: tegra-aes - fix error return code
  crypto: crypto4xx - fix error return code
  crypto: hifn_795x - fix error return code
  crypto: ux500 - fix error return code
  crypto: caam - fix error IDs for SEC v5.x RNG4
  hwrng: mxc-rnga - Access data via structure
  hwrng: mxc-rnga - Adapt clocks to new i.mx clock framework
  crypto: caam - add IPsec ESN support
  crypto: 842 - remove .cra_list initialization
  Revert "[CRYPTO] cast6: inline bloat--"
  ...
2012-10-04 09:06:34 -07:00
..
40x Merge remote-tracking branch 'jwb/next' into next 2011-12-16 11:24:25 +11:00
44x powerpc: Rename mapping based RELOCATABLE to DYNAMIC_MEMSTART for BookE 2011-12-20 10:20:19 -05:00
52xx powerpc, tqm5200: update tqm5200_defconfig to fit for charon board. 2011-09-29 15:36:33 +02:00
83xx powerpc/83xx: update defconfig for kmeter1 2012-07-10 07:07:20 -05:00
85xx powerpc/fsl: fix "Failed to mount /dev: No such device" errors 2012-08-23 10:46:20 -05:00
86xx ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
adder875_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
amigaone_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
c2k_defconfig powerpc: Fix build warning of the defconfigs 2011-04-27 14:18:41 +10:00
cell_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
celleb_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
chroma_defconfig memcg: rename config variables 2012-07-31 18:42:43 -07:00
chrp32_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
corenet32_smp_defconfig powerpc/fsl: fix "Failed to mount /dev: No such device" errors 2012-08-23 10:46:20 -05:00
corenet64_smp_defconfig powerpc/fsl: fix "Failed to mount /dev: No such device" errors 2012-08-23 10:46:20 -05:00
ep88xc_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ep8248e_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
g5_defconfig Revert "powerpc: Update g5_defconfig" 2012-08-24 20:55:55 +10:00
gamecube_defconfig perf: Remove PERF_COUNTERS config option 2012-04-26 13:52:52 +02:00
holly_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
linkstation_defconfig powerpc: Restore some misc devices to our configs 2011-03-30 10:36:23 +11:00
maple_defconfig powerpc: Remove CONFIG_POWER4_ONLY 2012-04-30 15:37:26 +10:00
mgcoge_defconfig powerpc/82xx: add SPI support for mgcoge 2012-07-10 07:07:20 -05:00
mpc83xx_defconfig powerpc/fsl: fix "Failed to mount /dev: No such device" errors 2012-08-23 10:46:20 -05:00
mpc85xx_defconfig powerpc/fsl: fix "Failed to mount /dev: No such device" errors 2012-08-23 10:46:20 -05:00
mpc85xx_smp_defconfig powerpc/fsl: fix "Failed to mount /dev: No such device" errors 2012-08-23 10:46:20 -05:00
mpc86xx_defconfig powerpc/fsl: enable verbose bug output 2011-05-19 01:14:30 -05:00
mpc512x_defconfig powerpc: update 512x-defconfig 2011-09-23 00:20:07 +02:00
mpc866_ads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mpc885_ads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mpc5200_defconfig powerpc/mpc5200: add options to mpc5200_defconfig 2012-03-21 10:40:28 +11:00
mpc7448_hpc2_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mpc8272_ads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
pasemi_defconfig powerpc: Remove CONFIG_POWER4_ONLY 2012-04-30 15:37:26 +10:00
pmac32_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
ppc6xx_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
ppc40x_defconfig Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-11-06 17:12:03 -08:00
ppc44x_defconfig powerpc/44x: Add mtd ndfc to the ppx44x defconfig 2011-11-25 10:06:00 +11:00
ppc64_defconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-10-04 09:06:34 -07:00
ppc64e_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
pq2fads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
prpmc2800_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
ps3_defconfig powerpc/ps3: Refresh ps3_defconfig 2012-04-24 18:18:01 -07:00
pseries_defconfig powerpc/crypto: rework Kconfig 2012-08-01 17:47:52 +08:00
storcenter_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
tqm8xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
wii_defconfig perf: Remove PERF_COUNTERS config option 2012-04-26 13:52:52 +02:00