2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
linux-next/drivers/crypto
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
amcc crypto: crypto4xx - Perform read/modify/write on device control register 2011-06-30 07:44:05 +08:00
caam Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2011-07-25 12:53:15 -07:00
geode-aes.c crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) 2010-07-19 13:50:21 +08:00
geode-aes.h [CRYPTO] geode: do not copy the IV too often 2008-01-11 08:16:26 +11:00
hifn_795x.c crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT 2011-10-21 14:28:57 +02:00
ixp4xx_crypto.c Fix common misspellings 2011-03-31 11:26:23 -03:00
Kconfig crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT 2011-10-21 14:28:57 +02:00
Makefile crypto: s5p-sss - add S5PV210 advanced crypto engine support 2011-04-08 20:40:51 +08:00
mv_cesa.c crypto: add module.h to those files that are explicitly using it 2011-10-31 19:31:11 -04:00
mv_cesa.h crypto: mv_cesa - Add sha1 and hmac(sha1) async hash drivers 2010-04-13 16:50:49 +08:00
n2_asm.S crypto: n2 - Add Niagara2 crypto driver 2010-05-19 14:14:04 +10:00
n2_core.c crypto: n2 - Fix a get/put_cpu() imbalance 2011-08-15 15:20:19 +08:00
n2_core.h crypto: n2 - Add Niagara2 crypto driver 2010-05-19 14:14:04 +10:00
omap-aes.c crypto: omap-aes - don't treat NULL clk as an error 2011-01-29 15:57:32 +11:00
omap-sham.c crypto: omap-sham - do not schedule tasklet if there is no active requests 2011-06-30 07:44:05 +08:00
padlock-aes.c crypto: padlock-aes - Make module loading even quieter when hardware is missing 2011-08-03 14:07:11 +08:00
padlock-sha.c crypto: padlock - Add SHA-1/256 module for VIA Nano 2011-03-27 10:45:18 +08:00
picoxcell_crypto_regs.h crypto: picoxcell - add support for the picoxcell crypto engines 2011-02-21 22:42:40 +11:00
picoxcell_crypto.c crypto: picoxcell - fix possible invalid pointer dereference 2011-08-10 19:00:27 +08:00
s5p-sss.c crypto: s5p-sss - add S5PV210 advanced crypto engine support 2011-04-08 20:40:51 +08:00
talitos.c crypto: talitos - handle descriptor not found in error path 2011-10-21 15:20:28 +02:00
talitos.h crypto: talitos - add support for sha224 2010-05-19 19:21:53 +10:00