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