Merge 4.6-rc3 into staging-next
This resolves a lot of merge issues with PAGE_CACHE_* changes, and an
iio driver merge issue.
Signed-off-by: 
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing
- .mailmap 1 addition, 0 deletions.mailmap
- Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl 12 additions, 17 deletionsDocumentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl
- Documentation/devicetree/bindings/clock/qca,ath79-pll.txt 3 additions, 3 deletionsDocumentation/devicetree/bindings/clock/qca,ath79-pll.txt
- Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt 6 additions, 6 deletions...ion/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt
- Documentation/filesystems/cramfs.txt 1 addition, 1 deletionDocumentation/filesystems/cramfs.txt
- Documentation/filesystems/tmpfs.txt 1 addition, 1 deletionDocumentation/filesystems/tmpfs.txt
- Documentation/filesystems/vfs.txt 2 additions, 2 deletionsDocumentation/filesystems/vfs.txt
- Documentation/networking/switchdev.txt 1 addition, 1 deletionDocumentation/networking/switchdev.txt
- Documentation/power/runtime_pm.txt 4 additions, 0 deletionsDocumentation/power/runtime_pm.txt
- Documentation/x86/topology.txt 208 additions, 0 deletionsDocumentation/x86/topology.txt
- MAINTAINERS 32 additions, 12 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arc/mm/cache.c 1 addition, 1 deletionarch/arc/mm/cache.c
- arch/arm/include/asm/unistd.h 1 addition, 1 deletionarch/arm/include/asm/unistd.h
- arch/arm/include/uapi/asm/unistd.h 2 additions, 0 deletionsarch/arm/include/uapi/asm/unistd.h
- arch/arm/kernel/calls.S 3 additions, 1 deletionarch/arm/kernel/calls.S
- arch/arm/kernel/setup.c 2 additions, 0 deletionsarch/arm/kernel/setup.c
- arch/arm/kvm/arm.c 33 additions, 19 deletionsarch/arm/kvm/arm.c
- arch/arm/mm/flush.c 2 additions, 2 deletionsarch/arm/mm/flush.c
- arch/arm/mm/proc-v7.S 5 additions, 5 deletionsarch/arm/mm/proc-v7.S
Loading
Please register or sign in to comment