Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

Documentation/accounting/getdelays.c

Documentation/kernel-parameters.txt

Documentation/scsi/scsi_mid_low_api.txt

Documentation/trace/postprocess/trace-vmscan-postprocess.pl

MAINTAINERS

Makefile

arch/arm/common/it8152.c

arch/arm/include/asm/hardware/it8152.h

arch/arm/mach-at91/include/mach/at91_mci.h

arch/arm/mach-ixp4xx/common-pci.c

arch/arm/mach-pxa/sleep.S

arch/arm/mach-s3c2412/Kconfig

arch/arm/mach-s3c2412/Makefile

arch/arm/mach-s3c2416/Kconfig

arch/arm/mach-s5pv210/mach-aquila.c

arch/arm/mach-s5pv210/mach-goni.c

arch/arm/mach-shmobile/include/mach/entry-macro.S

arch/arm/mach-shmobile/include/mach/vmalloc.h

arch/arm/plat-s3c24xx/Kconfig

arch/mips/mm/sc-mips.c