Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
clkdev.c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
dmabounce.c	Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel	2010-02-25 22:06:43 +00:00
gic.c	[ARM] 5556/1: Fix the irq_desc.cpu references	2009-06-19 15:11:16 +01:00
icst307.c
icst525.c
it8152.c	[ARM] 5298/1: Drop desc_handle_irq()	2008-10-09 15:00:36 +01:00
Kconfig	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel	2009-06-14 11:00:16 +01:00
locomo.c	ARM: 5711/1: locomo.c: CodingStyle cleanups	2009-09-21 16:03:04 +01:00
Makefile	[ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific	2009-06-11 22:20:22 +08:00
sa1111.c	ARM: 5735/1: sa1111: CodingStyle cleanups	2009-10-02 22:32:33 +01:00
scoop.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
sharpsl_param.c	[ARM] 4733/1: export sharpsl_param	2008-10-03 10:18:35 +01:00
time-acorn.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
uengine.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
via82c505.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
vic.c	ARM: 5881/1: vic.c: reorganize code	2010-01-20 12:28:29 +00:00