Russell King 534d0c92cf Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop ... Conflicts: MAINTAINERS		2009-10-02 22:31:04 +01:00
..
adma.c	dmaengine: cleanup unused transaction types	2009-09-08 17:42:52 -07:00
cp6.c
gpio.c
i2c.c
io.c
Makefile
pci.c
setup.c	Nicolas Pitre has a new email address	2009-09-15 09:37:12 -07:00
time.c	arch/arm/plat-iop: Use DIV_ROUND_CLOSEST	2009-08-18 14:06:52 -07:00