linux/arch/arm/plat-omap/include/plat
Linus Torvalds 2a8ba8f032 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits)
  random: simplify fips mode
  crypto: authenc - Fix cryptlen calculation
  crypto: talitos - add support for sha224
  crypto: talitos - add hash algorithms
  crypto: talitos - second prepare step for adding ahash algorithms
  crypto: talitos - prepare for adding ahash algorithms
  crypto: n2 - Add Niagara2 crypto driver
  crypto: skcipher - Add ablkcipher_walk interfaces
  crypto: testmgr - Add testing for async hashing and update/final
  crypto: tcrypt - Add speed tests for async hashing
  crypto: scatterwalk - Fix scatterwalk_done() test
  crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk
  padata: Use get_online_cpus/put_online_cpus in padata_free
  padata: Add some code comments
  padata: Flush the padata queues actively
  padata: Use a timer to handle remaining objects in the reorder queues
  crypto: shash - Remove usage of CRYPTO_MINALIGN
  crypto: mv_cesa - Use resource_size
  crypto: omap - OMAP macros corrected
  padata: Use get_online_cpus/put_online_cpus
  ...

Fix up conflicts in arch/arm/mach-omap2/devices.c
2010-05-21 14:46:51 -07:00
..
blizzard.h
board-ams-delta.h
board-sx1.h
board-voiceblue.h
board.h
clkdev_omap.h
clkdev.h
clock.h OMAP3 clock: rename RATE_IN_343X, RATE_IN_3430ES2 to match reality 2010-05-20 12:31:07 -06:00
clockdomain.h
common.h omap4: Move SOC specific code from board file 2010-05-20 11:17:51 -07:00
control.h omap4: Adding PBIAS Configuration for MMC1 Controller 2010-05-20 11:21:22 -07:00
cpu.h
display.h
dma-44xx.h
dma.h
dmtimer.h
dsp_common.h
flash.h
fpga.h
gpio-switch.h
gpio.h OMAP2/3: GPIO: generalize prepare for idle 2010-05-12 09:39:16 -07:00
gpmc-smc91x.h
gpmc.h
hardware.h
hwa742.h
i2c.h
io.h
iommu2.h
iommu.h
iovmm.h
irda.h
irqs-44xx.h
irqs.h omap: add missing FIQ_START definition required forarch/arm/kernel/fiq.c compilation 2010-05-05 11:11:10 -07:00
keypad.h
lcd_mipid.h
led.h
mailbox.h
mcbsp.h Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
mcspi.h
memory.h
menelaus.h
mmc.h omap: hsmmc: fix the hsmmc driver for am3517 2010-05-20 11:17:51 -07:00
multi.h omap2/3/4: Fix multi.h when omap3 and omap4 are selected without omap2 2010-05-03 17:21:31 -07:00
mux.h
nand.h omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabled 2010-04-23 15:35:11 -07:00
omap7xx.h
omap16xx.h
omap24xx.h
omap34xx.h crypto: omap - Updates omap sham device related platform code 2010-05-03 11:10:03 +08:00
omap44xx.h OMAP4: PRM: Remove MPU internal code name and apply PRCM naming convention 2010-05-20 12:31:11 -06:00
omap730.h
omap850.h
omap1510.h
omap_device.h
omap_hwmod.h OMAP4: hwmod: Replace OCPIF_HAS_IDLEST by HWMOD_NO_IDLEST 2010-05-20 12:31:09 -06:00
omap-alsa.h
omap-pm.h
onenand.h
param.h
powerdomain.h OMAP4 powerdomain: Support LOWPOWERSTATECHANGE for powerdomains 2010-05-20 12:31:13 -06:00
prcm.h
sdrc.h
serial.h omap2/3: Fix DEBUG_LL for omap zoom2/3 2010-05-03 17:53:08 -07:00
smp.h
sram.h
system.h
tc.h
timer-gp.h
timex.h
uncompress.h omap: Use a memory address for storing the debug port info instead of UART1 scratchpad 2010-05-03 17:53:08 -07:00
usb.h USB: omap3: add platform init code for OHCI driver 2010-05-20 13:21:44 -07:00
vram.h
vrfb.h