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
..
Makefile	…
adma.c	…
cp6.c	…
gpio.c	…
i2c.c	…
io.c	…
pci.c	…
setup.c	…
time.c	…