alistair23-linux/arch/arm/plat-omap
Linus Torvalds 4b30b6f23a Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  MAINTAINERS: add maintainer of CSR SiRFprimaII machine
  ARM: CSR: initializing L2 cache
  ARM: CSR: mapping early DEBUG_LL uart
  ARM: CSR: Adding CSR SiRFprimaII board support
  OMAP4: clocks: Update the clock tree with 4460 clock nodes
  OMAP4: PRCM: OMAP4460 specific PRM and CM register bitshifts
  OMAP4: ID: add omap_has_feature for max freq supported
  OMAP: ID: introduce chip detection for OMAP4460
  ARM: Xilinx: merge board file into main platform code
  ARM: Xilinx: Adding Xilinx board support

Fix up conflicts in arch/arm/mach-omap2/cm-regbits-44xx.h
2011-07-26 17:09:31 -07:00
..
include/plat Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:09:31 -07:00
clock.c arm: don't create useless copies to pass into debugfs_create_dir() 2011-07-20 20:47:52 -04:00
common.c
counter_32k.c Convert OMAPs 32kHz clocksource implementation to use the generic MMIO 2011-07-10 23:05:34 -07:00
cpu-omap.c
debug-devices.c
debug-leds.c
devices.c Fix common misspellings 2011-03-31 11:26:23 -03:00
dma.c Fix common misspellings 2011-03-31 11:26:23 -03:00
dmtimer.c omap2+: Reserve clocksource and timesource and initialize dmtimer later 2011-06-27 12:14:01 -07:00
fb.c
fb.h
i2c.c
io.c
iommu-debug.c
iommu.c omap: iommu: Return IRQ_HANDLED in fault handler when no fault occured 2011-05-11 10:47:50 -07:00
iopgtable.h
iovmm.c OMAP: iovmm: fix SW flags passed by user 2011-06-01 02:25:04 -07:00
Kconfig OMAP PM: remove OMAP_PM_NONE config option 2011-07-09 19:15:41 -06:00
mailbox.c Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2011-03-16 08:20:19 -07:00
Makefile GPIO: OMAP: move to drivers/gpio 2011-05-27 08:43:34 -07:00
mcbsp.c omap: mcbsp: Remove rx_/tx_word_length variables 2011-07-07 12:06:16 -07:00
mux.c
ocpi.c
omap-pm-noop.c
omap_device.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
sram.c ARM: pm: omap3: run the ASM sleep code from DDR 2011-06-29 19:07:47 +01:00
sram.h
usb.c