Skip to content
  • Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew) · 68abbe72
    Linus Torvalds authored
    Merge updates from Andrew Morton:
    
     - a few misc things
    
     - ocfs2 updates
    
     - v9fs updates
    
     - MM
    
     - procfs updates
    
     - lib/ updates
    
     - autofs updates
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
      autofs: small cleanup in autofs_getpath()
      autofs: clean up includes
      autofs: comment on selinux changes needed for module autoload
      autofs: update MAINTAINERS entry for autofs
      autofs: use autofs instead of autofs4 in documentation
      autofs: rename autofs documentation files
      autofs: create autofs Kconfig and Makefile
      autofs: delete fs/autofs4 source files
      autofs: update fs/autofs4/Makefile
      autofs: update fs/autofs4/Kconfig
      autofs: copy autofs4 to autofs
      autofs4: use autofs instead of autofs4 everywhere
      autofs4: merge auto_fs.h and auto_fs4.h
      fs/binfmt_misc.c: do not allow offset overflow
      checkpatch: improve patch recognition
      lib/ucs2_string.c: add MODULE_LICENSE()
      lib/mpi: headers cleanup
      lib/percpu_ida.c: use _irqsave() instead of local_irq_save() + spin_lock
      lib/idr.c: remove simple_ida_lock
      lib/bitmap.c: micro-optimization for __bitmap_complement()
      ...
    68abbe72