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