• Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew) · d52bd54d
    Linus Torvalds authored
    Merge yet more updates from Andrew Morton:
     - the rest of ocfs2
     - various hotfixes, mainly MM
     - quite a bit of misc stuff - drivers, fork, exec, signals, etc.
     - printk updates
     - firmware
     - checkpatch
     - nilfs2
     - more kexec stuff than usual
     - rapidio updates
     - w1 things
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (111 commits)
      ipc: delete "nr_ipc_ns"
      kcov: allow more fine-grained coverage instrumentation
      init/Kconfig: add clarification for out-of-tree modules
      config: add android config fragments
      init/Kconfig: ban CONFIG_LOCALVERSION_AUTO with allmodconfig
      relay: add global mode support for buffer-only channels
      init: allow blacklisting of module_init functions
      w1:omap_hdq: fix regression
      w1: add helper macro module_w1_family
      w1: remove need for ida and use PLATFORM_DEVID_AUTO
      rapidio/switches: add driver for IDT gen3 switches
      powerpc/fsl_rio: apply changes for RIO spec rev 3
      rapidio: modify for rev.3 specification changes
      rapidio: change inbound window size type to u64
      rapidio/idt_gen2: fix locking warning
      rapidio: fix error handling in mbox request/release functions
      rapidio/tsi721_dma: advance queue processing from transfer submit call
      rapidio/tsi721: add messaging mbox selector parameter
      rapidio/tsi721: add PCIe MRRS override parameter
      rapidio/tsi721_dma: add channel mask and queue size parameters
Makefile.lib 14.5 KB