Russell King f165eb77f4 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable ... Conflicts: arch/arm/mach-pxa/palmt5.c arch/arm/mach-pxa/palmtreo.c		2010-08-06 18:10:25 +01:00
..
clkdev.c	Merge branch 'devel-stable' into devel	2010-05-17 17:24:04 +01:00
dmabounce.c
gic.c	ARM: 6150/1: gic: implement set_type	2010-06-16 22:26:08 +01:00
icst.c
it8152.c	[ARM] pxa: remove now unnecessary dma_needs_bounce()	2010-08-05 14:32:21 +08:00
Kconfig
locomo.c
Makefile
pl330.c
sa1111.c	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-08-03 14:31:24 -07:00
scoop.c
sharpsl_param.c
time-acorn.c
uengine.c
via82c505.c
vic.c