summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2013-02-21Merge remote-tracking branch 'modem_shm/remoteproc-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'dma-buf/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'pwm/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'renesas/next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'arm-soc/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-omap2/board-3430sdp.c arch/arm/mach-omap2/board-zoom-peripherals.c arch/arm/mach-s3c64xx/dma.c arch/arm/mach-shmobile/setup-r8a7740.c arch/arm/mach-shmobile/setup-sh73a0.c arch/arm/mach-spear3xx/spear3xx.c arch/arm/mach-spear6xx/spear6xx.c arch/arm/mach-zynq/common.c drivers/clk/Makefile drivers/clocksource/Kconfig drivers/clocksource/Makefile drivers/crypto/omap-sham.c drivers/input/keyboard/tegra-kbc.c drivers/irqchip/Makefile drivers/mfd/db8500-prcmu.c drivers/mmc/card/block.c drivers/mmc/core/core.c drivers/mmc/core/sdio.c drivers/mmc/host/sdhci-bcm2835.c drivers/mmc/host/sdhci-esdhc-imx.c drivers/mmc/host/sdhci-pxav3.c drivers/mmc/host/sh_mmcif.c drivers/pinctrl/pinctrl-nomadik.c include/asm-generic/vmlinux.lds.h include/linux/mmc/host.h
2013-02-21Merge remote-tracking branch 'gpio-lw/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'gpio/gpio/next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'vhost/linux-next'Stephen Rothwell
Conflicts: drivers/vhost/Makefile
2013-02-21Merge remote-tracking branch 'char-misc/char-misc-next'Stephen Rothwell
Conflicts: drivers/char/pcmcia/synclink_cs.c drivers/ipack/devices/ipoctal.c drivers/mfd/wm5102-tables.c include/linux/mfd/arizona/pdata.h
2013-02-21Merge remote-tracking branch 'staging/staging-next'Stephen Rothwell
Conflicts: drivers/staging/et131x/et131x.c
2013-02-21Merge remote-tracking branch 'usb/usb-next'Stephen Rothwell
Conflicts: drivers/usb/gadget/Kconfig drivers/usb/musb/omap2430.c drivers/usb/phy/omap-usb2.c
2013-02-21Merge remote-tracking branch 'tty/tty-next'Stephen Rothwell
Conflicts: drivers/i2c/busses/Kconfig drivers/lguest/Kconfig drivers/net/can/Kconfig drivers/net/wan/Kconfig
2013-02-21Merge remote-tracking branch 'driver-core/driver-core-next'Stephen Rothwell
Conflicts: drivers/acpi/Kconfig drivers/dma/dw_dmac.c drivers/i2c/busses/i2c-s3c2410.c drivers/iommu/tegra-smmu.c drivers/net/ethernet/8390/Kconfig drivers/net/ethernet/fujitsu/Kconfig drivers/net/ethernet/i825xx/Kconfig drivers/net/ethernet/intel/Kconfig drivers/net/ethernet/racal/Kconfig drivers/net/ethernet/seeq/Kconfig drivers/net/wan/Kconfig drivers/net/wireless/rtlwifi/Kconfig drivers/pinctrl/pinctrl-nomadik.c drivers/spi/Kconfig drivers/spi/spi-s3c64xx.c drivers/vhost/Kconfig drivers/vhost/Kconfig.tcm net/wanrouter/Kconfig
2013-02-21Merge remote-tracking branch 'leds/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'drivers-x86/linux-next'Stephen Rothwell
Conflicts: drivers/platform/x86/apple-gmux.c drivers/platform/x86/compal-laptop.c drivers/platform/x86/fujitsu-tablet.c drivers/platform/x86/ideapad-laptop.c drivers/platform/x86/intel_oaktrail.c drivers/platform/x86/toshiba_acpi.c
2013-02-21Merge remote-tracking branch 'xen-two/linux-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'kvm/linux-next'Stephen Rothwell
Conflicts: arch/s390/include/asm/irq.h arch/s390/kernel/irq.c arch/x86/include/asm/vmx.h include/uapi/linux/kvm.h
2013-02-21Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'edac/linux_next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'trivial/for-next'Stephen Rothwell
Conflicts: arch/mips/cavium-octeon/executive/cvmx-helper-util.c arch/mips/include/asm/octeon/cvmx-helper-util.h
2013-02-21Merge remote-tracking branch 'vfio/next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'iommu/next'Stephen Rothwell
Conflicts: arch/arm/mach-exynos/mach-exynos5-dt.c
2013-02-21Merge remote-tracking branch 'watchdog/master'Stephen Rothwell
Conflicts: drivers/watchdog/Kconfig drivers/watchdog/Makefile
2013-02-21Merge remote-tracking branch 'security/next'Stephen Rothwell
Conflicts: lib/digsig.c security/integrity/ima/ima_main.c
2013-02-21Merge remote-tracking branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/gpio/Kconfig include/linux/mfd/abx500/ab8500.h
2013-02-21Merge remote-tracking branch 'md/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'mmc/mmc-next'Stephen Rothwell
2013-02-21Merge branch 'device-mapper/master'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'block/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'virtio/virtio-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'sound/for-next'Stephen Rothwell
Conflicts: drivers/spi/spi-s3c64xx.c
2013-02-21Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'drm/drm-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/radeon/evergreen_cs.c
2013-02-21Merge remote-tracking branch 'l2-mtd/master'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'net-next/master'Stephen Rothwell
Conflicts: arch/mips/include/uapi/asm/socket.h crypto/ctr.c include/linux/ssb/ssb_driver_gige.h
2013-02-21Merge remote-tracking branch 'slave-dma/next'Stephen Rothwell
Conflicts: drivers/dma/ioat/dma_v3.c drivers/dma/tegra20-apb-dma.c
2013-02-21Merge remote-tracking branch 'target-updates/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'scsi/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'thermal/next'Stephen Rothwell
Conflicts: drivers/thermal/exynos_thermal.c
2013-02-21Merge remote-tracking branch 'infiniband/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'libata/NEXT'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'v4l-dvb/master'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'i2c/i2c/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'hid/for-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'pci/next'Stephen Rothwell
Conflicts: arch/ia64/pci/pci.c drivers/acpi/internal.h drivers/acpi/scan.c drivers/pci/hotplug/acpiphp_glue.c drivers/pci/pci-acpi.c
2013-02-21Merge remote-tracking branch 'ceph/master'Stephen Rothwell
2013-02-21Merge remote-tracking branch 's390/features'Stephen Rothwell
Conflicts: arch/s390/Kconfig
2013-02-21Merge remote-tracking branch 'powerpc/next'Stephen Rothwell
Conflicts: Documentation/devicetree/bindings/crypto/fsl-sec4.txt arch/powerpc/configs/pasemi_defconfig
2013-02-21Merge remote-tracking branch 'mips/mips-for-linux-next'Stephen Rothwell
2013-02-21Merge remote-tracking branch 'metag/for-next'Stephen Rothwell
Conflicts: tools/perf/perf.h