• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial · e9b62693
    Linus Torvalds authored
    * '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
    e9b62693
firmware_sample_driver.c 2.75 KB