]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 22 Aug 2013 05:50:47 +0000 (15:50 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
Documentation/driver-model/devres.txt
Stephen Rothwell [Thu, 22 Aug 2013 05:50:40 +0000 (15:50 +1000)]
Merge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Thu, 22 Aug 2013 05:48:20 +0000 (15:48 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
include/linux/usb/usbnet.h
Stephen Rothwell [Thu, 22 Aug 2013 05:39:39 +0000 (15:39 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/Makefile
drivers/tty/serial/sh-sci.c
include/linux/of.h
include/uapi/linux/serial_core.h
Stephen Rothwell [Thu, 22 Aug 2013 05:30:20 +0000 (15:30 +1000)]
next-
20130821/driver-core
Conflicts:
net/core/net-sysfs.c
Stephen Rothwell [Thu, 22 Aug 2013 05:19:47 +0000 (15:19 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 05:17:58 +0000 (15:17 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 05:16:07 +0000 (15:16 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Thu, 22 Aug 2013 05:07:13 +0000 (15:07 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Conflicts:
kernel/workqueue.c
Stephen Rothwell [Thu, 22 Aug 2013 04:52:18 +0000 (14:52 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Thu, 22 Aug 2013 04:44:37 +0000 (14:44 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Conflicts:
mm/Kconfig
Stephen Rothwell [Thu, 22 Aug 2013 04:35:38 +0000 (14:35 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Thu, 22 Aug 2013 04:26:35 +0000 (14:26 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 22 Aug 2013 04:17:27 +0000 (14:17 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/include/asm/processor.h
drivers/video/simplefb.c
Stephen Rothwell [Thu, 22 Aug 2013 04:15:25 +0000 (14:15 +1000)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 04:13:47 +0000 (14:13 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 04:10:34 +0000 (14:10 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Thu, 22 Aug 2013 04:01:37 +0000 (14:01 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/crypto/ux500/hash/hash_core.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
drivers/net/wireless/iwlwifi/mvm/time-event.c
Stephen Rothwell [Thu, 22 Aug 2013 03:59:51 +0000 (13:59 +1000)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Thu, 22 Aug 2013 03:57:03 +0000 (13:57 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 22 Aug 2013 03:55:23 +0000 (13:55 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 22 Aug 2013 03:50:42 +0000 (13:50 +1000)]
Merge remote-tracking branch 'selinux/master'
Conflicts:
security/selinux/hooks.c
Stephen Rothwell [Thu, 22 Aug 2013 03:45:26 +0000 (13:45 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 22 Aug 2013 03:43:42 +0000 (13:43 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:42:02 +0000 (13:42 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:40:21 +0000 (13:40 +1000)]
Merge remote-tracking branch 'fbdev/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:38:43 +0000 (13:38 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 22 Aug 2013 03:36:56 +0000 (13:36 +1000)]
Merge remote-tracking branch 'mfd/master'
Stephen Rothwell [Thu, 22 Aug 2013 03:35:13 +0000 (13:35 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:33:30 +0000 (13:33 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:33:25 +0000 (13:33 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:31:46 +0000 (13:31 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:22:33 +0000 (13:22 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:22:27 +0000 (13:22 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:17:36 +0000 (13:17 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
include/net/netprio_cgroup.h
Stephen Rothwell [Thu, 22 Aug 2013 03:15:51 +0000 (13:15 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 22 Aug 2013 03:14:13 +0000 (13:14 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:07:37 +0000 (13:07 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:05:52 +0000 (13:05 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:03:55 +0000 (13:03 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 03:02:10 +0000 (13:02 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/i915_gem_dmabuf.c
Stephen Rothwell [Thu, 22 Aug 2013 03:00:14 +0000 (13:00 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_pm.c
Stephen Rothwell [Thu, 22 Aug 2013 02:53:48 +0000 (12:53 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 22 Aug 2013 02:52:07 +0000 (12:52 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 22 Aug 2013 02:50:29 +0000 (12:50 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Thu, 22 Aug 2013 02:48:35 +0000 (12:48 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 02:46:56 +0000 (12:46 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 22 Aug 2013 02:44:43 +0000 (12:44 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
Stephen Rothwell [Thu, 22 Aug 2013 02:42:55 +0000 (12:42 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Thu, 22 Aug 2013 02:36:35 +0000 (12:36 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
Stephen Rothwell [Thu, 22 Aug 2013 02:31:51 +0000 (12:31 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 22 Aug 2013 02:30:13 +0000 (12:30 +1000)]
Merge remote-tracking branch 'dlm/next'
Conflicts:
fs/dlm/user.c
Stephen Rothwell [Thu, 22 Aug 2013 02:28:32 +0000 (12:28 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Thu, 22 Aug 2013 02:26:52 +0000 (12:26 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 02:25:15 +0000 (12:25 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 22 Aug 2013 02:23:29 +0000 (12:23 +1000)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Thu, 22 Aug 2013 02:15:40 +0000 (12:15 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 22 Aug 2013 02:13:49 +0000 (12:13 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 02:12:03 +0000 (12:12 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 02:10:05 +0000 (12:10 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 22 Aug 2013 02:08:27 +0000 (12:08 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 22 Aug 2013 02:06:48 +0000 (12:06 +1000)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Thu, 22 Aug 2013 02:04:05 +0000 (12:04 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 02:02:19 +0000 (12:02 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 01:58:24 +0000 (11:58 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 22 Aug 2013 01:52:00 +0000 (11:52 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/ext4/namei.c
mm/shmem.c
Stephen Rothwell [Thu, 22 Aug 2013 01:43:12 +0000 (11:43 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Conflicts:
fs/xfs/xfs_inode.c
Stephen Rothwell [Thu, 22 Aug 2013 01:41:30 +0000 (11:41 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 22 Aug 2013 01:39:50 +0000 (11:39 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 01:36:54 +0000 (11:36 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 22 Aug 2013 01:35:08 +0000 (11:35 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 22 Aug 2013 01:33:26 +0000 (11:33 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 22 Aug 2013 01:30:53 +0000 (11:30 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 22 Aug 2013 01:29:12 +0000 (11:29 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Thu, 22 Aug 2013 01:27:35 +0000 (11:27 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 22 Aug 2013 01:25:57 +0000 (11:25 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Thu, 22 Aug 2013 01:17:57 +0000 (11:17 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 22 Aug 2013 01:16:17 +0000 (11:16 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Thu, 22 Aug 2013 01:14:36 +0000 (11:14 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 01:12:56 +0000 (11:12 +1000)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Thu, 22 Aug 2013 01:12:54 +0000 (11:12 +1000)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Thu, 22 Aug 2013 01:04:56 +0000 (11:04 +1000)]
Merge remote-tracking branch 'aio-direct/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 00:57:16 +0000 (10:57 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 22 Aug 2013 00:55:38 +0000 (10:55 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
include/linux/serial_sci.h
Stephen Rothwell [Thu, 22 Aug 2013 00:53:54 +0000 (10:53 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 22 Aug 2013 00:52:17 +0000 (10:52 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 22 Aug 2013 00:49:21 +0000 (10:49 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 22 Aug 2013 00:47:44 +0000 (10:47 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 00:46:04 +0000 (10:46 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 22 Aug 2013 00:44:27 +0000 (10:44 +1000)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Thu, 22 Aug 2013 00:42:51 +0000 (10:42 +1000)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 00:41:16 +0000 (10:41 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 00:39:38 +0000 (10:39 +1000)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 22 Aug 2013 00:37:59 +0000 (10:37 +1000)]
Merge remote-tracking branch 'cris/for-next'
Conflicts:
arch/cris/arch-v32/drivers/Kconfig
Stephen Rothwell [Thu, 22 Aug 2013 00:37:44 +0000 (10:37 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Thu, 22 Aug 2013 00:36:09 +0000 (10:36 +1000)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Thu, 22 Aug 2013 00:34:29 +0000 (10:34 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 00:32:54 +0000 (10:32 +1000)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Thu, 22 Aug 2013 00:24:10 +0000 (10:24 +1000)]
Merge remote-tracking branch 'drm-intel-fixes/drm-intel-fixes'
Stephen Rothwell [Thu, 22 Aug 2013 00:23:57 +0000 (10:23 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'
projects / karo-tx-linux.git / log