summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2014-07-18Merge branch 'akpm-current/current'Stephen Rothwell
Conflicts: arch/x86/syscalls/syscall_64.tbl
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 'pwm/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'gpio/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'pinctrl/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'scsi/for-next'Stephen Rothwell
Conflicts: include/scsi/sg.h
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 'xen-tip/linux-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 '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 '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 'mmc-uh/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'device-mapper/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'block/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'sound-asoc/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'drm-intel/for-linux-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'drm-panel/drm/panel/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'drm/drm-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/i915/intel_drv.h
2014-07-18Merge remote-tracking branch 'crypto/master'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'l2-mtd/master'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'infiniband/for-next'Stephen Rothwell
Conflicts: drivers/infiniband/hw/cxgb4/device.c
2014-07-18Merge remote-tracking branch 'bluetooth/master'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'wireless-next/master'Stephen Rothwell
2014-07-18next-20140717/net-nextStephen Rothwell
2014-07-18Merge remote-tracking branch 'dmaengine/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'slave-dma/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'thermal/next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'pm/linux-next'Stephen Rothwell
Conflicts: drivers/acpi/acpi_extlog.c
2014-07-18Merge remote-tracking branch 'libata/for-next'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'v4l-dvb/master'Stephen Rothwell
2014-07-18Merge remote-tracking branch 'hwmon-staging/hwmon-next'Stephen Rothwell