]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 20 Feb 2013 04:39:42 +0000 (15:39 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/et131x/et131x.c
Stephen Rothwell [Wed, 20 Feb 2013 04:38:04 +0000 (15:38 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/gadget/Kconfig
drivers/usb/host/ehci-vt8500.c
drivers/usb/musb/omap2430.c
drivers/usb/phy/omap-usb2.c
Stephen Rothwell [Wed, 20 Feb 2013 04:32:35 +0000 (15:32 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/i2c/busses/Kconfig
drivers/lguest/Kconfig
drivers/net/can/Kconfig
drivers/net/wan/Kconfig
Stephen Rothwell [Wed, 20 Feb 2013 04:25:06 +0000 (15:25 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
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/spi/Kconfig
drivers/spi/spi-s3c64xx.c
drivers/vhost/Kconfig
drivers/vhost/Kconfig.tcm
net/wanrouter/Kconfig
Stephen Rothwell [Wed, 20 Feb 2013 04:19:29 +0000 (15:19 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:17:53 +0000 (15:17 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:16:16 +0000 (15:16 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
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
Stephen Rothwell [Wed, 20 Feb 2013 04:08:52 +0000 (15:08 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:02:20 +0000 (15:02 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:59:34 +0000 (14:59 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:57:55 +0000 (14:57 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/irq.h
arch/s390/kernel/irq.c
arch/x86/include/asm/vmx.h
include/uapi/linux/kvm.h
Stephen Rothwell [Wed, 20 Feb 2013 03:51:29 +0000 (14:51 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:43:53 +0000 (14:43 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/powerpc/configs/pasemi_defconfig
arch/s390/Kconfig
kernel/timeconst.pl
Stephen Rothwell [Wed, 20 Feb 2013 03:41:07 +0000 (14:41 +1100)]
Merge remote-tracking branch 'spi/spi/next'
Conflicts:
drivers/spi/spi-s3c64xx.c
Stephen Rothwell [Wed, 20 Feb 2013 03:38:17 +0000 (14:38 +1100)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Wed, 20 Feb 2013 03:36:48 +0000 (14:36 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:35:18 +0000 (14:35 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 20 Feb 2013 03:28:05 +0000 (14:28 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
arch/mips/cavium-octeon/executive/cvmx-helper-util.c
arch/mips/include/asm/octeon/cvmx-helper-util.h
Stephen Rothwell [Wed, 20 Feb 2013 03:26:28 +0000 (14:26 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Wed, 20 Feb 2013 03:24:57 +0000 (14:24 +1100)]
Merge remote-tracking branch 'iommu/next'
Conflicts:
arch/arm/mach-exynos/mach-exynos5-dt.c
Stephen Rothwell [Wed, 20 Feb 2013 03:23:20 +0000 (14:23 +1100)]
Merge remote-tracking branch 'watchdog/master'
Conflicts:
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
Stephen Rothwell [Wed, 20 Feb 2013 03:23:11 +0000 (14:23 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 20 Feb 2013 03:21:40 +0000 (14:21 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
lib/digsig.c
security/integrity/ima/ima_main.c
Stephen Rothwell [Wed, 20 Feb 2013 03:20:09 +0000 (14:20 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:18:27 +0000 (14:18 +1100)]
Merge remote-tracking branch 'battery/master'
Conflicts:
include/linux/mfd/abx500/ab8500.h
Stephen Rothwell [Wed, 20 Feb 2013 03:16:55 +0000 (14:16 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:15:25 +0000 (14:15 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:08:20 +0000 (14:08 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:08:04 +0000 (14:08 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:06:33 +0000 (14:06 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:04:50 +0000 (14:04 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Wed, 20 Feb 2013 02:56:43 +0000 (13:56 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:48:55 +0000 (13:48 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:47:22 +0000 (13:47 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 20 Feb 2013 02:45:53 +0000 (13:45 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:38:59 +0000 (13:38 +1100)]
Merge remote-tracking branch 'pekey/devel-pekey'
Stephen Rothwell [Wed, 20 Feb 2013 02:33:39 +0000 (13:33 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:31:40 +0000 (13:31 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:24:25 +0000 (13:24 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'
Stephen Rothwell [Wed, 20 Feb 2013 02:22:26 +0000 (13:22 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/radeon/evergreen_cs.c
Stephen Rothwell [Wed, 20 Feb 2013 02:20:50 +0000 (13:20 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 20 Feb 2013 02:19:11 +0000 (13:19 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 20 Feb 2013 02:13:21 +0000 (13:13 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/mips/include/uapi/asm/socket.h
crypto/ctr.c
Stephen Rothwell [Wed, 20 Feb 2013 02:13:12 +0000 (13:13 +1100)]
Merge remote-tracking branch 'dmaengine/next'
Conflicts:
drivers/dma/ioat/dma_v3.c
Stephen Rothwell [Wed, 20 Feb 2013 02:09:13 +0000 (13:09 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/ioat/dma_v3.c
drivers/dma/tegra20-apb-dma.c
Stephen Rothwell [Wed, 20 Feb 2013 02:07:33 +0000 (13:07 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:05:58 +0000 (13:05 +1100)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:04:28 +0000 (13:04 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 20 Feb 2013 02:02:52 +0000 (13:02 +1100)]
Merge remote-tracking branch 'thermal/next'
Conflicts:
drivers/thermal/exynos_thermal.c
Stephen Rothwell [Wed, 20 Feb 2013 01:55:18 +0000 (12:55 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/acpi/internal.h
drivers/acpi/scan.c
drivers/pci/hotplug/acpiphp_glue.c
drivers/pci/pci-acpi.c
Stephen Rothwell [Wed, 20 Feb 2013 01:29:59 +0000 (12:29 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:28:04 +0000 (12:28 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 20 Feb 2013 01:22:21 +0000 (12:22 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:20:26 +0000 (12:20 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 20 Feb 2013 01:18:56 +0000 (12:18 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:17:33 +0000 (12:17 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:16:06 +0000 (12:16 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:12:45 +0000 (12:12 +1100)]
Merge remote-tracking branch 'pci/next'
Conflicts:
arch/ia64/pci/pci.c
Stephen Rothwell [Wed, 20 Feb 2013 01:11:15 +0000 (12:11 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Conflicts:
fs/xfs/xfs_buf_item.c
Stephen Rothwell [Wed, 20 Feb 2013 01:09:51 +0000 (12:09 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:08:06 +0000 (12:08 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:06:33 +0000 (12:06 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:04:12 +0000 (12:04 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:02:38 +0000 (12:02 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 20 Feb 2013 01:01:15 +0000 (12:01 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 20 Feb 2013 00:58:58 +0000 (11:58 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 20 Feb 2013 00:52:25 +0000 (11:52 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 00:51:03 +0000 (11:51 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 20 Feb 2013 00:43:43 +0000 (11:43 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 20 Feb 2013 00:42:20 +0000 (11:42 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 20 Feb 2013 00:40:59 +0000 (11:40 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 20 Feb 2013 00:39:35 +0000 (11:39 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 00:38:12 +0000 (11:38 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Wed, 20 Feb 2013 00:38:10 +0000 (11:38 +1100)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Wed, 20 Feb 2013 00:36:48 +0000 (11:36 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Wed, 20 Feb 2013 00:35:25 +0000 (11:35 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 20 Feb 2013 00:28:13 +0000 (11:28 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 20 Feb 2013 00:26:52 +0000 (11:26 +1100)]
Merge remote-tracking branch 'galak/next'
Conflicts:
Documentation/devicetree/bindings/crypto/fsl-sec4.txt
Stephen Rothwell [Wed, 20 Feb 2013 00:25:30 +0000 (11:25 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 20 Feb 2013 00:22:58 +0000 (11:22 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 20 Feb 2013 00:20:52 +0000 (11:20 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 00:19:32 +0000 (11:19 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Wed, 20 Feb 2013 00:17:20 +0000 (11:17 +1100)]
Stephen Rothwell [Tue, 19 Feb 2013 23:59:55 +0000 (10:59 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 19 Feb 2013 23:52:22 +0000 (10:52 +1100)]
Merge remote-tracking branch 'metag/for-next'
Conflicts:
tools/perf/perf.h
Stephen Rothwell [Tue, 19 Feb 2013 23:52:20 +0000 (10:52 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 19 Feb 2013 23:50:58 +0000 (10:50 +1100)]
Merge remote-tracking branch 'ia64/next'
Conflicts:
drivers/firmware/efivars.c
init/Kconfig
Stephen Rothwell [Tue, 19 Feb 2013 23:49:30 +0000 (10:49 +1100)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Tue, 19 Feb 2013 23:48:08 +0000 (10:48 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Tue, 19 Feb 2013 23:48:05 +0000 (10:48 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Tue, 19 Feb 2013 23:46:38 +0000 (10:46 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 19 Feb 2013 23:44:33 +0000 (10:44 +1100)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Tue, 19 Feb 2013 23:37:15 +0000 (10:37 +1100)]
Merge remote-tracking branch 'dwmw2/master'
Conflicts:
arch/x86/Kconfig
Stephen Rothwell [Tue, 19 Feb 2013 23:37:11 +0000 (10:37 +1100)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 19 Feb 2013 23:37:08 +0000 (10:37 +1100)]
Merge remote-tracking branch 'md-current/for-linus'
Stephen Rothwell [Tue, 19 Feb 2013 23:36:56 +0000 (10:36 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 19 Feb 2013 23:36:55 +0000 (10:36 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 19 Feb 2013 23:36:54 +0000 (10:36 +1100)]
Merge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Tue, 19 Feb 2013 23:36:53 +0000 (10:36 +1100)]
Merge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Tue, 19 Feb 2013 23:36:52 +0000 (10:36 +1100)]
Merge remote-tracking branch 'kbuild-current/rc-fixes'
projects / karo-tx-linux.git / log