]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 29 Oct 2012 02:48:37 +0000 (13:48 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:46:56 +0000 (13:46 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Mon, 29 Oct 2012 02:45:14 +0000 (13:45 +1100)]
Merge remote-tracking branch 'ixp4xx/next'
Stephen Rothwell [Mon, 29 Oct 2012 02:45:12 +0000 (13:45 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:43:31 +0000 (13:43 +1100)]
Merge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:41:53 +0000 (13:41 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:40:09 +0000 (13:40 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ux500/cpu-db8500.c
Stephen Rothwell [Mon, 29 Oct 2012 02:38:29 +0000 (13:38 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:38:13 +0000 (13:38 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Mon, 29 Oct 2012 02:36:18 +0000 (13:36 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:29:43 +0000 (13:29 +1100)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:28:08 +0000 (13:28 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:26:13 +0000 (13:26 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/comedi/drivers/amplc_dio200.c
Stephen Rothwell [Mon, 29 Oct 2012 02:23:58 +0000 (13:23 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/misc/ezusb.c
Stephen Rothwell [Mon, 29 Oct 2012 02:21:38 +0000 (13:21 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:19:57 +0000 (13:19 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:18:19 +0000 (13:18 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:16:31 +0000 (13:16 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:14:38 +0000 (13:14 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:13:00 +0000 (13:13 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:11:08 +0000 (13:11 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:09:22 +0000 (13:09 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Mon, 29 Oct 2012 02:07:38 +0000 (13:07 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
Stephen Rothwell [Mon, 29 Oct 2012 02:00:07 +0000 (13:00 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Mon, 29 Oct 2012 01:52:39 +0000 (12:52 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 29 Oct 2012 01:51:00 +0000 (12:51 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:49:22 +0000 (12:49 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:47:38 +0000 (12:47 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:45:53 +0000 (12:45 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Mon, 29 Oct 2012 01:44:12 +0000 (12:44 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Mon, 29 Oct 2012 01:36:38 +0000 (12:36 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:34:56 +0000 (12:34 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:33:18 +0000 (12:33 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:28:06 +0000 (12:28 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 29 Oct 2012 01:26:19 +0000 (12:26 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 29 Oct 2012 01:26:13 +0000 (12:26 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 29 Oct 2012 01:19:21 +0000 (12:19 +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 [Mon, 29 Oct 2012 01:17:38 +0000 (12:17 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:15:43 +0000 (12:15 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:08:35 +0000 (12:08 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:08:26 +0000 (12:08 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:06:49 +0000 (12:06 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 29 Oct 2012 01:05:02 +0000 (12:05 +1100)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Mon, 29 Oct 2012 01:03:21 +0000 (12:03 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
init/Kconfig
Stephen Rothwell [Mon, 29 Oct 2012 00:58:59 +0000 (11:58 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 00:57:12 +0000 (11:57 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 29 Oct 2012 00:55:37 +0000 (11:55 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 29 Oct 2012 00:48:48 +0000 (11:48 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Mon, 29 Oct 2012 00:46:55 +0000 (11:46 +1100)]
Merge commit 'refs/next/
20121026/sound-asoc'
Stephen Rothwell [Mon, 29 Oct 2012 00:35:25 +0000 (11:35 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 00:33:48 +0000 (11:33 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 29 Oct 2012 00:32:09 +0000 (11:32 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 29 Oct 2012 00:30:34 +0000 (11:30 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Mon, 29 Oct 2012 00:28:58 +0000 (11:28 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 29 Oct 2012 00:26:55 +0000 (11:26 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 29 Oct 2012 00:23:08 +0000 (11:23 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 29 Oct 2012 00:21:29 +0000 (11:21 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 29 Oct 2012 00:19:35 +0000 (11:19 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 00:17:56 +0000 (11:17 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Mon, 29 Oct 2012 00:16:16 +0000 (11:16 +1100)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Mon, 29 Oct 2012 00:16:09 +0000 (11:16 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Mon, 29 Oct 2012 00:15:44 +0000 (11:15 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 29 Oct 2012 00:13:29 +0000 (11:13 +1100)]
Merge commit 'refs/next/
20121026/v4l-dvb'
Stephen Rothwell [Sun, 28 Oct 2012 23:59:47 +0000 (10:59 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:58:16 +0000 (10:58 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Sun, 28 Oct 2012 23:56:43 +0000 (10:56 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Sun, 28 Oct 2012 23:55:08 +0000 (10:55 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:53:38 +0000 (10:53 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:52:02 +0000 (10:52 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:50:22 +0000 (10:50 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:50:14 +0000 (10:50 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:48:23 +0000 (10:48 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:46:47 +0000 (10:46 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:45:11 +0000 (10:45 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Sun, 28 Oct 2012 23:43:42 +0000 (10:43 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Sun, 28 Oct 2012 23:41:59 +0000 (10:41 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:40:25 +0000 (10:40 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:38:50 +0000 (10:38 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Sun, 28 Oct 2012 23:37:14 +0000 (10:37 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Sun, 28 Oct 2012 23:35:45 +0000 (10:35 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Sun, 28 Oct 2012 23:34:13 +0000 (10:34 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Sun, 28 Oct 2012 23:32:43 +0000 (10:32 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Sun, 28 Oct 2012 23:32:40 +0000 (10:32 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:31:09 +0000 (10:31 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Sun, 28 Oct 2012 23:29:38 +0000 (10:29 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:28:08 +0000 (10:28 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Sun, 28 Oct 2012 23:26:41 +0000 (10:26 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Conflicts:
arch/m68k/include/asm/termios.h
arch/m68k/include/uapi/asm/auxvec.h
arch/m68k/include/uapi/asm/msgbuf.h
arch/m68k/include/uapi/asm/sembuf.h
arch/m68k/include/uapi/asm/shmbuf.h
arch/m68k/include/uapi/asm/socket.h
arch/m68k/include/uapi/asm/sockios.h
arch/m68k/include/uapi/asm/termbits.h
Stephen Rothwell [Sun, 28 Oct 2012 23:22:26 +0000 (10:22 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:20:55 +0000 (10:20 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Sun, 28 Oct 2012 23:19:25 +0000 (10:19 +1100)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Sun, 28 Oct 2012 23:17:48 +0000 (10:17 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Sun, 28 Oct 2012 23:16:21 +0000 (10:16 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Sun, 28 Oct 2012 23:14:49 +0000 (10:14 +1100)]
Merge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Sun, 28 Oct 2012 23:13:09 +0000 (10:13 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Sun, 28 Oct 2012 23:12:57 +0000 (10:12 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Sun, 28 Oct 2012 23:12:48 +0000 (10:12 +1100)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Sun, 28 Oct 2012 23:12:38 +0000 (10:12 +1100)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Sun, 28 Oct 2012 23:12:35 +0000 (10:12 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Sun, 28 Oct 2012 23:12:35 +0000 (10:12 +1100)]
Merge remote-tracking branch 'sparc/master'
Stephen Rothwell [Sun, 28 Oct 2012 23:12:33 +0000 (10:12 +1100)]
Merge remote-tracking branch 'kbuild-current/rc-fixes'
projects / karo-tx-linux.git / log