Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
  DOC:  A couple corrections and clarifications in USB doc.
  Generate a slightly more informative error msg for bad HZ
  fix typo "is" -> "if" in Makefile
  ext*: spelling fix prefered -> preferred
  DOCUMENTATION:  Use newer DEFINE_SPINLOCK macro in docs.
  KEYS:  Fix the comment to match the file name in rxrpc-type.h.
  RAID: remove trailing space from printk line
  DMA engine: typo fixes
  Remove unused MAX_NODES_SHIFT
  MAINTAINERS: Clarify access to OCFS2 development mailing list.
  V4L: Storage class should be before const qualifier (sn9c102)
  V4L: Storage class should be before const qualifier
  sonypi: Storage class should be before const qualifier
  intel_menlow: Storage class should be before const qualifier
  DVB: Storage class should be before const qualifier
  arm: Storage class should be before const qualifier
  ALSA: Storage class should be before const qualifier
  acpi: Storage class should be before const qualifier
  firmware_sample_driver.c: fix coding style
  MAINTAINERS: Add ati_remote2 driver
  ...

Fixed up trivial conflicts in firmware_sample_driver.c

diff --cc Documentation/DocBook/kernel-locking.tmpl
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-pxa/mfp-pxa3xx.c
Simple merge

diff --cc include/linux/jiffies.h
Simple merge

diff --cc kernel/stop_machine.c
Simple merge

diff --cc mm/pdflush.c
Simple merge

diff --cc samples/firmware_class/firmware_sample_driver.c
index 165cff9,600cdd9..11114f3
--- 1/samples/firmware_class/firmware_sample_driver.c
--- 2/Documentation/firmware_class/firmware_sample_driver.c
+++ b/samples/firmware_class/firmware_sample_driver.c
@@@ -73,6 -66,6 +73,7 @@@ static void sample_probe_specific(void
  
        /* finish setting up the device */
  }
++
  static void sample_probe_async_cont(const struct firmware *fw, void *context)
  {
        if (!fw) {