Merge branch 'oprofile/urgent' into oprofile/core

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/hwmon/sysfs-interface

Documentation/kernel-doc-nano-HOWTO.txt

Documentation/kernel-parameters.txt

Documentation/mutex-design.txt

Documentation/power/regulator/overview.txt

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

Documentation/workqueue.txt

MAINTAINERS

Makefile

arch/Kconfig

arch/alpha/include/asm/cache.h

arch/alpha/include/asm/cacheflush.h

arch/alpha/include/asm/unistd.h