Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm/plat-omap
History
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
..
include/plat Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2010-05-21 14:46:51 -07:00
clock.c OMAP4 clock: Support clk_set_parent 2010-05-20 12:31:12 -06:00
common.c omap4: Move SOC specific code from board file 2010-05-20 11:17:51 -07:00
cpu-omap.c OMAP clock/CPUFreq: add clk_exit_cpufreq_table() 2010-01-08 15:23:16 -07:00
debug-devices.c omap: use smc91x_platdata to setup smc91x 2009-12-11 16:16:33 -08:00
debug-leds.c const: constify remaining dev_pm_ops 2009-12-15 08:53:25 -08:00
devices.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
dma.c omap: DMA: Fix multi-line comments 2010-05-20 11:16:39 -07:00
dmtimer.c OMAP: timers: Fix clock source names for OMAP4 2010-05-20 12:31:13 -06:00
fb.c OMAP: DSS2: omapfb driver 2009-12-09 12:12:44 +02:00
gpio.c omap: GPIO: Fix OMAP4 GPIO reg access issues 2010-05-20 11:17:51 -07:00
i2c.c omap4: Add support for i2c init 2010-05-20 11:36:43 -07:00
io.c Merge with mainline to remove plat-omap/Kconfig conflict 2010-03-01 14:19:05 -08:00
iommu-debug.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
iommu.c omap iommu: Reject unaligned addresses at setting page table entry 2010-05-14 10:23:39 +03:00
iopgtable.h omap iommu: cleanup iommu page address mask and definitions 2010-02-15 10:03:32 -08:00
iovmm.c omap iommu: Exit iteration if no possibility of available area 2010-05-14 10:23:37 +03:00
Kconfig omap iommu: Make CONFIG_OMAP_IOMMU_DEBUG selectable 2010-05-14 10:23:34 +03:00
mailbox.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
Makefile
mcbsp.c Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
mux.c omap: mux: Add new style pin multiplexing code for omap3 2009-12-11 16:16:32 -08:00
ocpi.c
omap-pm-noop.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap_device.c OMAP powerdomain, hwmod, omap_device: add some credits 2010-05-20 12:31:14 -06:00
sram.c omap4: Fix multiboot with CONFIG_PM and CONFIG_ARCH_OMAP3 selected 2010-05-04 13:19:16 -07:00
usb.c omap1: Add omap7xx USB support 2009-12-11 16:16:34 -08:00