]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 7 Nov 2012 02:58:27 +0000 (13:58 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:56:38 +0000 (13:56 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:54:45 +0000 (13:54 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/telephony/Kconfig
Stephen Rothwell [Wed, 7 Nov 2012 02:41:03 +0000 (13:41 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/early/ehci-dbgp.c
Stephen Rothwell [Wed, 7 Nov 2012 02:38:37 +0000 (13:38 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/omap-serial.c
Stephen Rothwell [Wed, 7 Nov 2012 02:37:00 +0000 (13:37 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:35:20 +0000 (13:35 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:33:30 +0000 (13:33 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:31:37 +0000 (13:31 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:29:54 +0000 (13:29 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:28:13 +0000 (13:28 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:21:46 +0000 (13:21 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:21:35 +0000 (13:21 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
arch/powerpc/include/uapi/asm/epapr_hcalls.h
Stephen Rothwell [Wed, 7 Nov 2012 02:18:50 +0000 (13:18 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:11:24 +0000 (13:11 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 7 Nov 2012 02:03:54 +0000 (13:03 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 7 Nov 2012 02:02:17 +0000 (13:02 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Wed, 7 Nov 2012 02:00:35 +0000 (13:00 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 01:58:53 +0000 (12:58 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 01:57:07 +0000 (12:57 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 7 Nov 2012 01:55:28 +0000 (12:55 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Wed, 7 Nov 2012 01:47:52 +0000 (12:47 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/x86/pci/acpi.c
Stephen Rothwell [Wed, 7 Nov 2012 01:46:01 +0000 (12:46 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 01:44:16 +0000 (12:44 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 7 Nov 2012 01:39:05 +0000 (12:39 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 7 Nov 2012 01:37:19 +0000 (12:37 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 7 Nov 2012 01:37:12 +0000 (12:37 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 7 Nov 2012 01:30:17 +0000 (12:30 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/cifs/cifsacl.c
net/dns_resolver/dns_key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c
Stephen Rothwell [Wed, 7 Nov 2012 01:28:28 +0000 (12:28 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 01:26:39 +0000 (12:26 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 01:25:01 +0000 (12:25 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 01:17:40 +0000 (12:17 +1100)]
Merge remote-tracking branch 'slab/for-next'
Conflicts:
mm/slob.c
Stephen Rothwell [Wed, 7 Nov 2012 01:17:30 +0000 (12:17 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 7 Nov 2012 01:15:54 +0000 (12:15 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 7 Nov 2012 01:14:06 +0000 (12:14 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Wed, 7 Nov 2012 01:12:28 +0000 (12:12 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
drivers/block/floppy.c
init/Kconfig
Stephen Rothwell [Wed, 7 Nov 2012 01:08:04 +0000 (12:08 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 01:06:27 +0000 (12:06 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 7 Nov 2012 01:04:46 +0000 (12:04 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 7 Nov 2012 00:57:55 +0000 (11:57 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 7 Nov 2012 00:56:13 +0000 (11:56 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 00:54:22 +0000 (11:54 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 00:52:43 +0000 (11:52 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 7 Nov 2012 00:51:03 +0000 (11:51 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 7 Nov 2012 00:49:26 +0000 (11:49 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Wed, 7 Nov 2012 00:47:47 +0000 (11:47 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 7 Nov 2012 00:45:43 +0000 (11:45 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 7 Nov 2012 00:38:20 +0000 (11:38 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 7 Nov 2012 00:34:21 +0000 (11:34 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 7 Nov 2012 00:32:29 +0000 (11:32 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 00:27:21 +0000 (11:27 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Wed, 7 Nov 2012 00:25:46 +0000 (11:25 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 7 Nov 2012 00:24:08 +0000 (11:24 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Wed, 7 Nov 2012 00:22:30 +0000 (11:22 +1100)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Wed, 7 Nov 2012 00:22:22 +0000 (11:22 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Wed, 7 Nov 2012 00:15:52 +0000 (11:15 +1100)]
Merge remote-tracking branch 'acpi/next'
Stephen Rothwell [Wed, 7 Nov 2012 00:15:39 +0000 (11:15 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 7 Nov 2012 00:05:33 +0000 (11:05 +1100)]
Merge commit 'refs/next/
20121026/v4l-dvb'
Stephen Rothwell [Tue, 6 Nov 2012 23:52:49 +0000 (10:52 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:51:20 +0000 (10:51 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Tue, 6 Nov 2012 23:51:19 +0000 (10:51 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:49:46 +0000 (10:49 +1100)]
Merge branch 'i2c/master'
Stephen Rothwell [Tue, 6 Nov 2012 23:48:09 +0000 (10:48 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:44:47 +0000 (10:44 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 6 Nov 2012 23:43:15 +0000 (10:43 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:41:40 +0000 (10:41 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:40:00 +0000 (10:40 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:39:52 +0000 (10:39 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:38:00 +0000 (10:38 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:36:24 +0000 (10:36 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:34:48 +0000 (10:34 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 6 Nov 2012 23:33:19 +0000 (10:33 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 6 Nov 2012 23:31:36 +0000 (10:31 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:30:00 +0000 (10:30 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:28:21 +0000 (10:28 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Tue, 6 Nov 2012 23:26:46 +0000 (10:26 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Tue, 6 Nov 2012 23:25:17 +0000 (10:25 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 6 Nov 2012 23:23:41 +0000 (10:23 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 6 Nov 2012 23:22:11 +0000 (10:22 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Tue, 6 Nov 2012 23:22:08 +0000 (10:22 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:20:35 +0000 (10:20 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Tue, 6 Nov 2012 23:19:06 +0000 (10:19 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:17:34 +0000 (10:17 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 6 Nov 2012 23:16:00 +0000 (10:16 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:14:25 +0000 (10:14 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:12:54 +0000 (10:12 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 6 Nov 2012 23:11:26 +0000 (10:11 +1100)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Tue, 6 Nov 2012 23:09:57 +0000 (10:09 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:08:28 +0000 (10:08 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Tue, 6 Nov 2012 23:06:29 +0000 (10:06 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 6 Nov 2012 23:05:00 +0000 (10:05 +1100)]
Merge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Tue, 6 Nov 2012 22:58:02 +0000 (09:58 +1100)]
Merge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Tue, 6 Nov 2012 22:57:50 +0000 (09:57 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Tue, 6 Nov 2012 22:57:33 +0000 (09:57 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Tue, 6 Nov 2012 22:57:24 +0000 (09:57 +1100)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 6 Nov 2012 22:57:21 +0000 (09:57 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Tue, 6 Nov 2012 22:57:20 +0000 (09:57 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 6 Nov 2012 22:57:19 +0000 (09:57 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 6 Nov 2012 22:57:18 +0000 (09:57 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 6 Nov 2012 22:57:18 +0000 (09:57 +1100)]
Merge remote-tracking branch 'sparc/master'
projects / karo-tx-linux.git / log