Merge remote branch 'trond/bugfixes' into for-2.6.37

Documentation/DocBook/device-drivers.tmpl

Documentation/DocBook/kernel-api.tmpl

Documentation/DocBook/kernel-locking.tmpl

Documentation/DocBook/tracepoint.tmpl

Documentation/block/cfq-iosched.txt

Documentation/cgroups/blkio-controller.txt

Documentation/gpio.txt

Documentation/kernel-doc-nano-HOWTO.txt

Documentation/kernel-parameters.txt

Documentation/mutex-design.txt

Documentation/sound/alsa/HD-Audio-Models.txt

MAINTAINERS

Makefile

arch/alpha/include/asm/cache.h

arch/alpha/kernel/err_marvel.c

arch/alpha/kernel/perf_event.c

arch/alpha/kernel/proto.h

arch/alpha/kernel/sys_cabriolet.c

arch/alpha/kernel/sys_takara.c

arch/arm/Kconfig