• Linus Torvalds's avatar
    Merge branch 'akpm' (Andrew's incoming - part two) · 092f4c56
    Linus Torvalds authored
    Says Andrew:
    
     "60 patches.  That's good enough for -rc1 I guess.  I have quite a lot
      of detritus to be rechecked, work through maintainers, etc.
    
     - most of the remains of MM
     - rtc
     - various misc
     - cgroups
     - memcg
     - cpusets
     - procfs
     - ipc
     - rapidio
     - sysctl
     - pps
     - w1
     - drivers/misc
     - aio"
    
    * akpm: (60 commits)
      memcg: replace ss->id_lock with a rwlock
      aio: allocate kiocbs in batches
      drivers/misc/vmw_balloon.c: fix typo in code comment
      drivers/misc/vmw_balloon.c: determine page allocation flag can_sleep outside loop
      w1: disable irqs in critical section
      drivers/w1/w1_int.c: multiple masters used same init_name
      drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
      drivers/power/ds2780_battery.c: add a nolock function to w1 interface
      drivers/power/ds2780_battery.c: create central point for calling w1 interface
      w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
      pps gpio client: add missing dependency
      pps: new client driver using GPIO
      pps: default echo function
      include/linux/dma-mapping.h: add dma_zalloc_coherent()
      sysctl: make CONFIG_SYSCTL_SYSCALL default to n
      sysctl: add support for poll()
      RapidIO: documentation update
      drivers/net/rionet.c: fix ethernet address macros for LE platforms
      RapidIO: fix potential null deref in rio_setup_device()
      RapidIO: add mport driver for Tsi721 bridge
      ...
    092f4c56
proc_sysctl.c 11.1 KB