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
..
Makefile	…
clocks.c	…
dbdma.c	…
dma.c	…
gpiolib-au1000.c	…
irq.c	…
pci.c	…
platform.c	MIPS: Alchemy: fix build with SERIAL_8250=n	2010-12-16 18:11:01 +00:00
power.c	…
prom.c	…
setup.c	…
sleeper.S	…
time.c	…