Linus Torvalds 0bd3fbd4ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ...

Pull crypto updates from Herbert Xu:
 - New cipher/hash driver for ARM ux500.
 - Code clean-up for aesni-intel.
 - Misc fixes.

Fixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite
frankly some of it made no sense at all (the pull brought in a
declaration for the dbx500_add_platform_device_noirq() function, which
neither exists nor is used anywhere).

Also some trivial add-add context conflicts in the Kconfig file in
drivers/{char/hw_random,crypto}/

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: aesni-intel - move more common code to ablk_init_common
  crypto: aesni-intel - use crypto_[un]register_algs
  crypto: ux500 - Cleanup hardware identification
  crypto: ux500 - Update DMA handling for 3.4
  mach-ux500: crypto - core support for CRYP/HASH module.
  crypto: ux500 - Add driver for HASH hardware
  crypto: ux500 - Add driver for CRYP hardware
  hwrng: Kconfig - modify default state for atmel-rng driver
  hwrng: omap - use devm_request_and_ioremap
  crypto: crypto4xx - move up err_request_irq label
  crypto, xor: Sanitize checksumming function selection output
  crypto: caam - add backward compatible string sec4.0

2012-05-23 15:59:10 -07:00

..

agp

drm/i915: disable ppgtt on snb when dmar is enabled

2012-04-02 15:59:07 +02:00

hw_random

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-05-23 15:59:10 -07:00

ipmi

Merge branch 'akpm' (Andrew's patch-bomb)

2012-03-28 17:19:28 -07:00

mwave

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

pcmcia

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

tpm

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2012-03-21 13:25:04 -07:00

xilinx_hwicap

xilinx_hwicap: reset XHI_MAX_RETRIES

2012-04-19 19:09:18 -07:00

apm-emulation.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm

2012-04-05 17:34:30 -07:00

applicom.c

drivers/char/applicom.c: fix information leak to userland

2010-10-27 18:03:14 -07:00

applicom.h

…

bfin-otp.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

bsr.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

ds1302.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ds1620.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

dsp56k.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

dtlk.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

efirtc.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

generic_nvram.c

drivers: fix up various ->llseek() implementations

2011-07-20 20:47:58 -04:00

genrtc.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

hangcheck-timer.c

Input: sysrq - drop tty argument form handle_sysrq()

2010-08-21 00:34:45 -07:00

hpet.c

printk(): add KERN_CONT where needed in hpet and vt code

2012-04-09 10:30:39 -07:00

i8k.c

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

Kconfig

ramoops: Move to fs/pstore/ram.c

2012-05-16 08:06:37 -07:00

lp.c

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

Makefile

ramoops: Move to fs/pstore/ram.c

2012-05-16 08:06:37 -07:00

mbcs.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

mbcs.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

mem.c

printk - fix compilation for CONFIG_PRINTK=n

2012-05-09 15:51:09 -07:00

misc.c

switch device_get_devnode() and ->devnode() to umode_t *

2012-01-03 22:54:55 -05:00

mmtimer.c

posix-timers: Cleanup namespace

2011-02-02 15:28:19 +01:00

msm_smd_pkt.c

drivers/char/msm_smd_pkt.c: don't use IS_ERR()

2011-08-25 16:25:33 -07:00

mspec.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

nsc_gpio.c

[PATCH] struct path: convert char-drivers

2006-12-08 08:28:44 -08:00

nvram.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

nwbutton.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

nwbutton.h

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

nwflash.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

pc8736x_gpio.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

ppdev.c

drivers/char/ppdev.c: put gotten port value

2011-05-26 17:12:37 -07:00

ps3flash.c

drivers/char: Add module.h to those who were using it implicitly

2011-10-31 19:31:40 -04:00

random.c

drivers/char/random.c: fix boot id uniqueness race

2012-04-12 13:12:12 -07:00

raw.c

switch device_get_devnode() and ->devnode() to umode_t *

2012-01-03 22:54:55 -05:00

rtc.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

scx200_gpio.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

snsc_event.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

snsc.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

snsc.h

headers: kobject.h redux

2011-01-10 08:51:44 -08:00

sonypi.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

tb0219.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

tile-srom.c

tile-srom.c driver: minor code cleanup

2012-04-02 12:14:10 -04:00

tlclk.c

char: Fix typo in tlclk.c

2012-02-09 23:09:37 +01:00

toshiba.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

ttyprintk.c

TTY: remove re-assignments to tty_driver members

2012-03-08 11:37:58 -08:00

uv_mmtimer.c

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

virtio_console.c

virtio: console: tell host of open ports after resume from s3/s4

2012-05-17 12:14:33 +03:00