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
clkdev.h
dma.h	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
entry-macro.S	ARM: 5650/1: bcmring: add io.h, uncompress. h, and entry-macro.S	2009-08-15 16:01:42 +01:00
hardware.h
io.h	ARM: 5792/1: bcmring: clean up mach/io.h	2009-12-03 19:42:30 +00:00
irqs.h	ARM: 5645/1: bcmring: add bcmring irq.c	2009-08-15 16:01:39 +01:00
memory_settings.h	ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headers	2009-08-15 16:01:40 +01:00
memory.h	ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headers	2009-08-15 16:01:40 +01:00
reg_nand.h	mtd: add bcmring nand driver	2009-10-20 10:07:23 +09:00
reg_umi.h	mtd: add bcmring nand driver	2009-10-20 10:07:23 +09:00
system.h	ARM: 5748/1: bcmring: fix build warning messages	2009-10-07 13:13:01 +01:00
timer.h	ARM: 5649/1: bcmring: add bcmring timer function	2009-08-15 16:01:41 +01:00
timex.h	ARM: 5649/1: bcmring: add bcmring timer function	2009-08-15 16:01:41 +01:00
uncompress.h	ARM: 5650/1: bcmring: add io.h, uncompress. h, and entry-macro.S	2009-08-15 16:01:42 +01:00
vmalloc.h	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00