summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-18Merge branch 'akpm-current/current'Stephen Rothwell
Conflicts: arch/x86/syscalls/syscall_64.tbl
2014-07-18Merge branch 'rd-docs/master'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'aio/master'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'lzo-update/lzo-update'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'random/dev'Stephen Rothwell
Conflicts: drivers/char/hw_random/core.c
2014-07-18Merge remote-tracking branch 'clk/clk-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'ktest/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'userns/for-next'Stephen Rothwell
Conflicts: fs/btrfs/ioctl.c fs/dcache.c fs/namei.c fs/namespace.c
2014-07-18Merge remote-tracking branch 'pwm/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'gpio/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'vhost/linux-next'Stephen Rothwell
Conflicts: drivers/vhost/net.c
2014-07-18Merge remote-tracking branch 'pinctrl/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'scsi-core/core-for-3.16'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'scsi/for-next'Stephen Rothwell
Conflicts: include/scsi/sg.h
2014-07-18Merge remote-tracking branch 'cgroup/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'char-misc/char-misc-next'Stephen Rothwell
Conflicts: drivers/Kconfig drivers/Makefile
2014-07-18Merge remote-tracking branch 'staging/staging-next'Stephen Rothwell
Conflicts: drivers/staging/cxt1e1/linux.c drivers/staging/dgrp/dgrp_tty.c drivers/staging/media/sn9c102/Kconfig
2014-07-18Merge remote-tracking branch 'usb-gadget/next'Stephen Rothwell
Conflicts: drivers/usb/musb/musb_core.c drivers/usb/musb/musb_cppi41.c drivers/usb/musb/musb_host.c include/uapi/linux/usb/functionfs.h
2014-07-18Merge remote-tracking branch 'usb/usb-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'tty/tty-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'driver-core/driver-core-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'leds/for-next'Stephen Rothwell
Conflicts: drivers/hid/hid-gt683r.c
2014-07-18Merge remote-tracking branch 'hsi/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'chrome-platform/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'workqueues/for-next'Stephen Rothwell
Conflicts: kernel/workqueue.c
2014-07-18Merge remote-tracking branch 'percpu/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'xen-tip/linux-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'kvm/linux-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'rcu/rcu/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'ftrace/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'irqchip/irqchip/for-next'Stephen Rothwell
Conflicts: arch/arm64/Kconfig drivers/irqchip/irq-gic.c
2014-07-18Merge remote-tracking branch 'edac-amd/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'edac/linux_next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'spi/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'devicetree/devicetree/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'audit/master'Stephen Rothwell
Conflicts: arch/mips/include/asm/syscall.h arch/mips/kernel/ptrace.c arch/x86/Kconfig kernel/audit.c
2014-07-18Merge remote-tracking branch 'trivial/for-next'Stephen Rothwell
Conflicts: Documentation/laptops/freefall.c arch/arm/mach-msm/Kconfig
2014-07-18Merge remote-tracking branch 'iommu/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'selinux/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'integrity/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'security/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'regulator/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'omap_dss2/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'mfd-lj/for-mfd-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'slab/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'kgdb/kgdb-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'mmc-uh/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'device-mapper/for-next'Stephen Rothwell