Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
csp	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
include	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
arch.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
clock.c	ARM: 5644/1: add bcmring core.c, clock.c, clock.h	2009-08-15 16:01:38 +01:00
clock.h	ARM: 5644/1: add bcmring core.c, clock.c, clock.h	2009-08-15 16:01:38 +01:00
core.c	ARM: AMBA: Add pclk definition for platforms using primecells	2010-07-22 09:55:38 +01:00
core.h
dma_device.c	ARM: 5647/1: bcmring: add bcmring dma.h and dma_device.c	2009-08-15 16:01:40 +01:00
dma.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
irq.c	genirq: Cleanup irq_chip->typename leftovers	2010-09-23 19:12:26 +02:00
Kconfig	ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring	2009-08-15 16:01:50 +01:00
Makefile	ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring	2009-08-15 16:01:50 +01:00
Makefile.boot	ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring	2009-08-15 16:01:50 +01:00
mm.c	ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headers	2009-08-15 16:01:40 +01:00
timer.c	ARM: 5649/1: bcmring: add bcmring timer function	2009-08-15 16:01:41 +01:00