]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 4 Apr 2013 05:17:41 +0000 (16:17 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'
Conflicts:
arch/arm/Kconfig.debug
arch/arm/mach-imx/cpufreq.c
drivers/clocksource/Makefile
Stephen Rothwell [Thu, 4 Apr 2013 05:11:09 +0000 (16:11 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:09:34 +0000 (16:09 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'
Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug
Stephen Rothwell [Thu, 4 Apr 2013 05:03:01 +0000 (16:03 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 05:01:31 +0000 (16:01 +1100)]
Merge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'
Stephen Rothwell [Thu, 4 Apr 2013 04:59:58 +0000 (15:59 +1100)]
Merge remote-tracking branch 'gen-gpio/for_next'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
Stephen Rothwell [Thu, 4 Apr 2013 04:58:26 +0000 (15:58 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 04:56:56 +0000 (15:56 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Thu, 4 Apr 2013 04:55:25 +0000 (15:55 +1100)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'
Stephen Rothwell [Thu, 4 Apr 2013 04:53:46 +0000 (15:53 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/vhost/Makefile
Stephen Rothwell [Thu, 4 Apr 2013 04:52:02 +0000 (15:52 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 04:49:50 +0000 (15:49 +1100)]
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Stephen Rothwell [Thu, 4 Apr 2013 04:45:09 +0000 (15:45 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Thu, 4 Apr 2013 04:43:21 +0000 (15:43 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/ccg/f_fs.c
drivers/staging/ccg/rndis.c
drivers/staging/dgrp/dgrp_dpa_ops.c
drivers/staging/dgrp/dgrp_mon_ops.c
drivers/staging/dgrp/dgrp_net_ops.c
drivers/staging/dgrp/dgrp_ports_ops.c
drivers/staging/dgrp/dgrp_specproc.c
Stephen Rothwell [Thu, 4 Apr 2013 04:18:23 +0000 (15:18 +1100)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/chipidea/udc.c
drivers/usb/gadget/net2272.c
drivers/usb/gadget/net2280.c
drivers/usb/host/ehci-tegra.c
Stephen Rothwell [Thu, 4 Apr 2013 03:53:45 +0000 (14:53 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/serial/usb-serial.c
Stephen Rothwell [Thu, 4 Apr 2013 03:52:00 +0000 (14:52 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:45:07 +0000 (14:45 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:43:18 +0000 (14:43 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:41:34 +0000 (14:41 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:41:21 +0000 (14:41 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Conflicts:
drivers/platform/x86/chromeos_laptop.c
Stephen Rothwell [Thu, 4 Apr 2013 03:39:47 +0000 (14:39 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:38:18 +0000 (14:38 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:31:51 +0000 (14:31 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:30:12 +0000 (14:30 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Thu, 4 Apr 2013 03:28:35 +0000 (14:28 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
drivers/s390/kvm/virtio_ccw.c
Stephen Rothwell [Thu, 4 Apr 2013 03:21:00 +0000 (14:21 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 4 Apr 2013 03:13:29 +0000 (14:13 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Conflicts:
kernel/trace/ftrace.c
Stephen Rothwell [Thu, 4 Apr 2013 03:06:13 +0000 (14:06 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 4 Apr 2013 03:04:27 +0000 (14:04 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:55:36 +0000 (13:55 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/virtual/virtio-spec.txt
Stephen Rothwell [Thu, 4 Apr 2013 02:50:15 +0000 (13:50 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Thu, 4 Apr 2013 02:48:45 +0000 (13:48 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 4 Apr 2013 02:47:11 +0000 (13:47 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 4 Apr 2013 02:47:03 +0000 (13:47 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 4 Apr 2013 02:42:09 +0000 (13:42 +1100)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 4 Apr 2013 02:40:34 +0000 (13:40 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:39:05 +0000 (13:39 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:37:28 +0000 (13:37 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 4 Apr 2013 02:35:59 +0000 (13:35 +1100)]
Merge remote-tracking branch 'mfd/master'
Stephen Rothwell [Thu, 4 Apr 2013 02:34:27 +0000 (13:34 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:27:12 +0000 (13:27 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:27:08 +0000 (13:27 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:25:36 +0000 (13:25 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 4 Apr 2013 02:23:54 +0000 (13:23 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Thu, 4 Apr 2013 02:16:20 +0000 (13:16 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
drivers/block/drbd/drbd_proc.c
Stephen Rothwell [Thu, 4 Apr 2013 01:33:38 +0000 (12:33 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
include/linux/res_counter.h
Stephen Rothwell [Thu, 4 Apr 2013 01:26:42 +0000 (12:26 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 4 Apr 2013 01:21:15 +0000 (12:21 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Conflicts:
drivers/char/virtio_console.c
Stephen Rothwell [Thu, 4 Apr 2013 01:13:45 +0000 (12:13 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 4 Apr 2013 01:12:04 +0000 (12:12 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 01:10:21 +0000 (12:10 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 01:03:00 +0000 (12:03 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'
Stephen Rothwell [Thu, 4 Apr 2013 01:01:27 +0000 (12:01 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:59:54 +0000 (11:59 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:58:23 +0000 (11:58 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:56:26 +0000 (11:56 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/nfc/microread/mei.c
net/mac80211/sta_info.c
net/wireless/core.h
Stephen Rothwell [Thu, 4 Apr 2013 00:48:35 +0000 (11:48 +1100)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:40:47 +0000 (11:40 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
drivers/nfc/microread/mei.c
Stephen Rothwell [Thu, 4 Apr 2013 00:32:27 +0000 (11:32 +1100)]
Merge remote-tracking branch 'dmaengine/next'
Conflicts:
drivers/dma/ioat/dma_v3.c
Stephen Rothwell [Thu, 4 Apr 2013 00:28:25 +0000 (11:28 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 4 Apr 2013 00:26:47 +0000 (11:26 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:25:00 +0000 (11:25 +1100)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 4 Apr 2013 00:24:51 +0000 (11:24 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/base/power/qos.c
Stephen Rothwell [Thu, 4 Apr 2013 00:23:19 +0000 (11:23 +1100)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 4 Apr 2013 00:21:24 +0000 (11:21 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:19:55 +0000 (11:19 +1100)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:18:10 +0000 (11:18 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:16:14 +0000 (11:16 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/media/pci/bt8xx/bttv-input.c
drivers/media/platform/Kconfig
drivers/staging/media/go7007/go7007-driver.c
Stephen Rothwell [Thu, 4 Apr 2013 00:14:48 +0000 (11:14 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:13:24 +0000 (11:13 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Thu, 4 Apr 2013 00:11:08 +0000 (11:11 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 4 Apr 2013 00:09:38 +0000 (11:09 +1100)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-multitouch.c
Stephen Rothwell [Thu, 4 Apr 2013 00:06:21 +0000 (11:06 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 3 Apr 2013 23:59:27 +0000 (10:59 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:57:58 +0000 (10:57 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Conflicts:
fs/xfs/xfs_iomap.c
Stephen Rothwell [Wed, 3 Apr 2013 23:56:33 +0000 (10:56 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:54:41 +0000 (10:54 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:53:15 +0000 (10:53 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:51:43 +0000 (10:51 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:50:05 +0000 (10:50 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 3 Apr 2013 23:48:40 +0000 (10:48 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:47:17 +0000 (10:47 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 3 Apr 2013 23:45:54 +0000 (10:45 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 3 Apr 2013 23:42:47 +0000 (10:42 +1100)]
Stephen Rothwell [Wed, 3 Apr 2013 23:33:43 +0000 (10:33 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 3 Apr 2013 23:32:14 +0000 (10:32 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:32:11 +0000 (10:32 +1100)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Wed, 3 Apr 2013 23:30:46 +0000 (10:30 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 3 Apr 2013 23:29:24 +0000 (10:29 +1100)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Wed, 3 Apr 2013 23:28:01 +0000 (10:28 +1100)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Wed, 3 Apr 2013 23:26:39 +0000 (10:26 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 3 Apr 2013 23:24:10 +0000 (10:24 +1100)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Wed, 3 Apr 2013 23:22:47 +0000 (10:22 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 3 Apr 2013 23:21:22 +0000 (10:21 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:19:58 +0000 (10:19 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Wed, 3 Apr 2013 23:14:37 +0000 (10:14 +1100)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:13:15 +0000 (10:13 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 3 Apr 2013 23:11:52 +0000 (10:11 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 3 Apr 2013 23:10:30 +0000 (10:10 +1100)]
Merge remote-tracking branch 'hexagon/linux-next'
projects / karo-tx-linux.git / log