Merge branch 'akpm' (Andrew's incoming - part two)
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 ...
No related branches found
No related tags found
Showing
- Documentation/DMA-API.txt 7 additions, 0 deletionsDocumentation/DMA-API.txt
- Documentation/cgroups/memory.txt 0 additions, 1 deletionDocumentation/cgroups/memory.txt
- Documentation/feature-removal-schedule.txt 0 additions, 35 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/rapidio/rapidio.txt 1 addition, 1 deletionDocumentation/rapidio/rapidio.txt
- Documentation/rapidio/tsi721.txt 49 additions, 0 deletionsDocumentation/rapidio/tsi721.txt
- arch/powerpc/mm/gup.c 0 additions, 12 deletionsarch/powerpc/mm/gup.c
- arch/powerpc/mm/hugetlbpage.c 16 additions, 5 deletionsarch/powerpc/mm/hugetlbpage.c
- arch/powerpc/sysdev/fsl_rio.c 1 addition, 0 deletionsarch/powerpc/sysdev/fsl_rio.c
- arch/s390/mm/gup.c 13 additions, 1 deletionarch/s390/mm/gup.c
- arch/sparc/mm/gup.c 2 additions, 0 deletionsarch/sparc/mm/gup.c
- arch/x86/mm/gup.c 0 additions, 10 deletionsarch/x86/mm/gup.c
- drivers/misc/vmw_balloon.c 2 additions, 2 deletionsdrivers/misc/vmw_balloon.c
- drivers/net/rionet.c 2 additions, 2 deletionsdrivers/net/rionet.c
- drivers/power/ds2780_battery.c 51 additions, 35 deletionsdrivers/power/ds2780_battery.c
- drivers/pps/clients/Kconfig 9 additions, 0 deletionsdrivers/pps/clients/Kconfig
- drivers/pps/clients/Makefile 1 addition, 0 deletionsdrivers/pps/clients/Makefile
- drivers/pps/clients/pps-gpio.c 227 additions, 0 deletionsdrivers/pps/clients/pps-gpio.c
- drivers/pps/clients/pps-ktimer.c 0 additions, 12 deletionsdrivers/pps/clients/pps-ktimer.c
- drivers/pps/clients/pps_parport.c 0 additions, 9 deletionsdrivers/pps/clients/pps_parport.c
- drivers/pps/kapi.c 13 additions, 7 deletionsdrivers/pps/kapi.c
Loading
Please register or sign in to comment