]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 28 Jun 2013 06:27:23 +0000 (16:27 +1000)]
Merge branch 'akpm-current/current'
Stephen Rothwell [Fri, 28 Jun 2013 06:17:57 +0000 (16:17 +1000)]
Merge remote-tracking branch 'arm64-hugepages/for-next/hugepages'
Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/pgtable-hwdef.h
arch/arm64/include/asm/pgtable.h
Stephen Rothwell [Fri, 28 Jun 2013 06:16:16 +0000 (16:16 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Fri, 28 Jun 2013 06:14:37 +0000 (16:14 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Conflicts:
drivers/clk/tegra/clk-tegra114.c
Stephen Rothwell [Fri, 28 Jun 2013 06:12:52 +0000 (16:12 +1000)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 06:11:10 +0000 (16:11 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 06:09:32 +0000 (16:09 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Fri, 28 Jun 2013 06:09:28 +0000 (16:09 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
arch/arm/Kconfig
Stephen Rothwell [Fri, 28 Jun 2013 06:07:39 +0000 (16:07 +1000)]
Merge remote-tracking branch 'renesas/next'
Conflicts:
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/clock-r8a7778.c
arch/arm/mach-shmobile/include/mach/r8a7778.h
Stephen Rothwell [Fri, 28 Jun 2013 06:07:23 +0000 (16:07 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Conflicts:
arch/arm/boot/dts/kirkwood-6281.dtsi
Stephen Rothwell [Fri, 28 Jun 2013 06:07:00 +0000 (16:07 +1000)]
Merge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 06:05:18 +0000 (16:05 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 06:05:16 +0000 (16:05 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Fri, 28 Jun 2013 06:03:37 +0000 (16:03 +1000)]
Merge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 06:01:21 +0000 (16:01 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/sun4i-a10.dtsi
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-mxs/Kconfig
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/clock-r8a7778.c
arch/arm/mach-u300/timer.c
drivers/clocksource/dw_apb_timer_of.c
drivers/tty/serial/xilinx_uartps.c
drivers/usb/Kconfig
drivers/usb/phy/phy-rcar-usb.c
include/linux/mfd/davinci_voicecodec.h
include/linux/serial_sci.h
include/uapi/linux/serial_core.h
Stephen Rothwell [Fri, 28 Jun 2013 05:54:41 +0000 (15:54 +1000)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 05:53:03 +0000 (15:53 +1000)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Fri, 28 Jun 2013 05:50:17 +0000 (15:50 +1000)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'
Conflicts:
kernel/irq/irqdomain.c
Stephen Rothwell [Fri, 28 Jun 2013 05:42:29 +0000 (15:42 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Conflicts:
drivers/net/ethernet/ti/davinci_mdio.c
drivers/pinctrl/Makefile
Stephen Rothwell [Fri, 28 Jun 2013 05:40:12 +0000 (15:40 +1000)]
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Stephen Rothwell [Fri, 28 Jun 2013 05:31:46 +0000 (15:31 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Fri, 28 Jun 2013 05:29:57 +0000 (15:29 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
drivers/staging/serqt_usb2/serqt_usb2.c
drivers/staging/silicom/bpctl_mod.c
drivers/thermal/ti-soc-thermal/ti-thermal-common.c
Stephen Rothwell [Fri, 28 Jun 2013 05:27:44 +0000 (15:27 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/chipidea/Makefile
Stephen Rothwell [Fri, 28 Jun 2013 05:25:38 +0000 (15:25 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Fri, 28 Jun 2013 05:17:58 +0000 (15:17 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/base/cpu.c
drivers/base/memory.c
include/linux/device.h
include/linux/platform_device.h
Stephen Rothwell [Fri, 28 Jun 2013 05:16:19 +0000 (15:16 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 05:14:33 +0000 (15:14 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 05:06:05 +0000 (15:06 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 05:01:30 +0000 (15:01 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 04:54:26 +0000 (14:54 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Fri, 28 Jun 2013 04:52:39 +0000 (14:52 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/pgtable.h
Stephen Rothwell [Fri, 28 Jun 2013 04:50:33 +0000 (14:50 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 04:42:11 +0000 (14:42 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/arm/kernel/Makefile
kernel/futex.c
Stephen Rothwell [Fri, 28 Jun 2013 04:40:09 +0000 (14:40 +1000)]
Merge remote-tracking branch 'spi-mb/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 04:37:22 +0000 (14:37 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Fri, 28 Jun 2013 04:35:45 +0000 (14:35 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 04:27:22 +0000 (14:27 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/networking/netlink_mmap.txt
Stephen Rothwell [Fri, 28 Jun 2013 04:25:36 +0000 (14:25 +1000)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Fri, 28 Jun 2013 04:24:00 +0000 (14:24 +1000)]
Merge remote-tracking branch 'iommu/next'
Conflicts:
drivers/iommu/Kconfig
Stephen Rothwell [Fri, 28 Jun 2013 04:22:22 +0000 (14:22 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 28 Jun 2013 04:17:58 +0000 (14:17 +1000)]
Merge remote-tracking branch 'lblnet/master'
Stephen Rothwell [Fri, 28 Jun 2013 04:17:56 +0000 (14:17 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Fri, 28 Jun 2013 04:13:33 +0000 (14:13 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
Documentation/kernel-parameters.txt
Stephen Rothwell [Fri, 28 Jun 2013 04:11:50 +0000 (14:11 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 04:11:47 +0000 (14:11 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 04:09:43 +0000 (14:09 +1000)]
Merge remote-tracking branch 'fbdev/for-next'
Conflicts:
drivers/video/of_display_timing.c
Stephen Rothwell [Fri, 28 Jun 2013 04:08:05 +0000 (14:08 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 28 Jun 2013 04:06:26 +0000 (14:06 +1000)]
Merge remote-tracking branch 'mfd/master'
Stephen Rothwell [Fri, 28 Jun 2013 04:04:46 +0000 (14:04 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:56:51 +0000 (13:56 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:56:47 +0000 (13:56 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:55:06 +0000 (13:55 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:53:10 +0000 (13:53 +1000)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Fri, 28 Jun 2013 03:48:37 +0000 (13:48 +1000)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
include/linux/cgroup.h
Stephen Rothwell [Fri, 28 Jun 2013 03:44:02 +0000 (13:44 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:42:26 +0000 (13:42 +1000)]
Merge remote-tracking branch 'input-mt/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:40:47 +0000 (13:40 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 28 Jun 2013 03:39:06 +0000 (13:39 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:37:30 +0000 (13:37 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:35:44 +0000 (13:35 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:33:42 +0000 (13:33 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:32:06 +0000 (13:32 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:30:27 +0000 (13:30 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/i915/intel_sdvo.c
Stephen Rothwell [Fri, 28 Jun 2013 03:22:09 +0000 (13:22 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/drm_vm.c
Stephen Rothwell [Fri, 28 Jun 2013 03:20:29 +0000 (13:20 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 28 Jun 2013 03:18:52 +0000 (13:18 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 28 Jun 2013 03:13:55 +0000 (13:13 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 03:12:19 +0000 (13:12 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 28 Jun 2013 03:10:15 +0000 (13:10 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
net/wireless/nl80211.c
Stephen Rothwell [Fri, 28 Jun 2013 03:01:49 +0000 (13:01 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/renesas/sh_eth.c
fs/select.c
Stephen Rothwell [Fri, 28 Jun 2013 03:00:10 +0000 (13:00 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 28 Jun 2013 02:58:24 +0000 (12:58 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:56:17 +0000 (12:56 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:54:40 +0000 (12:54 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Fri, 28 Jun 2013 02:53:03 +0000 (12:53 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:51:27 +0000 (12:51 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:49:49 +0000 (12:49 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 28 Jun 2013 02:49:45 +0000 (12:49 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c
Stephen Rothwell [Fri, 28 Jun 2013 02:48:04 +0000 (12:48 +1000)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Fri, 28 Jun 2013 02:39:52 +0000 (12:39 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
MAINTAINERS
Stephen Rothwell [Fri, 28 Jun 2013 02:38:07 +0000 (12:38 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:36:25 +0000 (12:36 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:34:22 +0000 (12:34 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 28 Jun 2013 02:32:46 +0000 (12:32 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:31:10 +0000 (12:31 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:29:09 +0000 (12:29 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:25:19 +0000 (12:25 +1000)]
Merge remote-tracking branch 'pci/next'
Conflicts:
arch/ia64/sn/kernel/io_init.c
drivers/acpi/pci_root.c
drivers/pci/probe.c
include/linux/aer.h
Stephen Rothwell [Fri, 28 Jun 2013 02:17:13 +0000 (12:17 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:15:33 +0000 (12:15 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Conflicts:
fs/xfs/xfs_log_cil.c
fs/xfs/xfs_log_recover.c
Stephen Rothwell [Fri, 28 Jun 2013 02:12:27 +0000 (12:12 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:10:17 +0000 (12:10 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:08:41 +0000 (12:08 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:04:23 +0000 (12:04 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 28 Jun 2013 02:02:27 +0000 (12:02 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 28 Jun 2013 02:00:51 +0000 (12:00 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 28 Jun 2013 01:59:16 +0000 (11:59 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 28 Jun 2013 01:51:08 +0000 (11:51 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 28 Jun 2013 01:49:34 +0000 (11:49 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 28 Jun 2013 01:41:48 +0000 (11:41 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 28 Jun 2013 01:40:14 +0000 (11:40 +1000)]
Merge remote-tracking branch 'ext3/for_next'
projects / karo-tx-linux.git / log