]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 5 Sep 2011 06:45:48 +0000 (16:45 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Mon, 5 Sep 2011 06:41:50 +0000 (16:41 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
Stephen Rothwell [Mon, 5 Sep 2011 06:38:46 +0000 (16:38 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Mon, 5 Sep 2011 06:36:46 +0000 (16:36 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Mon, 5 Sep 2011 06:30:23 +0000 (16:30 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
arch/arm/plat-mxc/devices.c
Stephen Rothwell [Mon, 5 Sep 2011 06:28:55 +0000 (16:28 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 06:27:34 +0000 (16:27 +1000)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Mon, 5 Sep 2011 06:26:13 +0000 (16:26 +1000)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Mon, 5 Sep 2011 06:24:42 +0000 (16:24 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 06:23:22 +0000 (16:23 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 06:21:56 +0000 (16:21 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Mon, 5 Sep 2011 06:16:32 +0000 (16:16 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Mon, 5 Sep 2011 06:10:37 +0000 (16:10 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Mon, 5 Sep 2011 06:09:11 +0000 (16:09 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 5 Sep 2011 06:02:47 +0000 (16:02 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Mon, 5 Sep 2011 05:57:01 +0000 (15:57 +1000)]
Revert "Merge branch 'x86/spinlocks' into auto-latest"
This reverts commit
6f8fa39c81f12d98540598db42a1eaff65bba0ce, reversing
changes made to
4977f9bf2d9b511d36199ab3451a2592d6bc3793.
Stephen Rothwell [Mon, 5 Sep 2011 05:38:20 +0000 (15:38 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/mm/fault.c
Stephen Rothwell [Mon, 5 Sep 2011 05:38:01 +0000 (15:38 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Conflicts:
drivers/of/base.c
Stephen Rothwell [Mon, 5 Sep 2011 05:36:40 +0000 (15:36 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Mon, 5 Sep 2011 05:34:55 +0000 (15:34 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Mon, 5 Sep 2011 05:32:11 +0000 (15:32 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:30:50 +0000 (15:30 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:24:33 +0000 (15:24 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
arch/s390/include/asm/thread_info.h
drivers/mfd/twl4030-irq.c
Stephen Rothwell [Mon, 5 Sep 2011 05:23:09 +0000 (15:23 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:21:47 +0000 (15:21 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:20:27 +0000 (15:20 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 5 Sep 2011 05:19:01 +0000 (15:19 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 5 Sep 2011 05:18:19 +0000 (15:18 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:15:44 +0000 (15:15 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Mon, 5 Sep 2011 05:14:21 +0000 (15:14 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:12:57 +0000 (15:12 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:11:35 +0000 (15:11 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:10:07 +0000 (15:10 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:08:51 +0000 (15:08 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:02:35 +0000 (15:02 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:02:26 +0000 (15:02 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:01:05 +0000 (15:01 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 5 Sep 2011 05:00:58 +0000 (15:00 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Mon, 5 Sep 2011 04:59:14 +0000 (14:59 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 5 Sep 2011 04:57:41 +0000 (14:57 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Mon, 5 Sep 2011 04:51:50 +0000 (14:51 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 04:50:07 +0000 (14:50 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 5 Sep 2011 04:48:49 +0000 (14:48 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Mon, 5 Sep 2011 04:47:32 +0000 (14:47 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Mon, 5 Sep 2011 04:46:15 +0000 (14:46 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 04:44:48 +0000 (14:44 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 04:39:31 +0000 (14:39 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 5 Sep 2011 04:38:10 +0000 (14:38 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 5 Sep 2011 04:36:48 +0000 (14:36 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 5 Sep 2011 04:35:16 +0000 (14:35 +1000)]
Merge remote-tracking branch 'wireless/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
Stephen Rothwell [Mon, 5 Sep 2011 04:29:44 +0000 (14:29 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
MAINTAINERS
arch/powerpc/configs/40x/hcu4_defconfig
Stephen Rothwell [Mon, 5 Sep 2011 04:09:51 +0000 (14:09 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 5 Sep 2011 04:07:45 +0000 (14:07 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Mon, 5 Sep 2011 04:07:41 +0000 (14:07 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Mon, 5 Sep 2011 04:07:35 +0000 (14:07 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Mon, 5 Sep 2011 04:06:10 +0000 (14:06 +1000)]
Merge remote-tracking branch 'acpi/test'
Stephen Rothwell [Mon, 5 Sep 2011 04:04:52 +0000 (14:04 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 5 Sep 2011 04:04:46 +0000 (14:04 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 04:03:23 +0000 (14:03 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 04:02:03 +0000 (14:02 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Mon, 5 Sep 2011 04:00:50 +0000 (14:00 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Mon, 5 Sep 2011 03:59:35 +0000 (13:59 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 5 Sep 2011 03:58:21 +0000 (13:58 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Mon, 5 Sep 2011 03:57:03 +0000 (13:57 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Mon, 5 Sep 2011 03:55:53 +0000 (13:55 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Mon, 5 Sep 2011 03:54:36 +0000 (13:54 +1000)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Stephen Rothwell [Mon, 5 Sep 2011 03:53:14 +0000 (13:53 +1000)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_super.c
Stephen Rothwell [Mon, 5 Sep 2011 03:32:35 +0000 (13:32 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Mon, 5 Sep 2011 03:31:24 +0000 (13:31 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 03:29:58 +0000 (13:29 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 5 Sep 2011 03:24:03 +0000 (13:24 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 5 Sep 2011 03:22:50 +0000 (13:22 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 5 Sep 2011 03:21:36 +0000 (13:21 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 5 Sep 2011 03:20:22 +0000 (13:20 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 5 Sep 2011 03:19:03 +0000 (13:19 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 5 Sep 2011 03:17:48 +0000 (13:17 +1000)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Mon, 5 Sep 2011 03:16:35 +0000 (13:16 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 03:15:24 +0000 (13:15 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Mon, 5 Sep 2011 03:14:09 +0000 (13:14 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Mon, 5 Sep 2011 03:12:56 +0000 (13:12 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 5 Sep 2011 03:11:43 +0000 (13:11 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Mon, 5 Sep 2011 03:10:30 +0000 (13:10 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Mon, 5 Sep 2011 03:09:19 +0000 (13:09 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 5 Sep 2011 03:08:03 +0000 (13:08 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Mon, 5 Sep 2011 03:06:50 +0000 (13:06 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Mon, 5 Sep 2011 03:05:38 +0000 (13:05 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Mon, 5 Sep 2011 03:04:20 +0000 (13:04 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 03:03:08 +0000 (13:03 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 03:01:53 +0000 (13:01 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Mon, 5 Sep 2011 03:00:37 +0000 (13:00 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 02:59:26 +0000 (12:59 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Mon, 5 Sep 2011 02:58:14 +0000 (12:58 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Mon, 5 Sep 2011 02:57:00 +0000 (12:57 +1000)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c
Stephen Rothwell [Mon, 5 Sep 2011 02:06:25 +0000 (12:06 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-u300/Makefile.boot
Stephen Rothwell [Mon, 5 Sep 2011 02:05:08 +0000 (12:05 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
Stephen Rothwell [Mon, 5 Sep 2011 02:03:52 +0000 (12:03 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 5 Sep 2011 02:02:26 +0000 (12:02 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Mon, 5 Sep 2011 02:02:23 +0000 (12:02 +1000)]
Merge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Mon, 5 Sep 2011 02:02:22 +0000 (12:02 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Mon, 5 Sep 2011 02:02:21 +0000 (12:02 +1000)]
Merge remote-tracking branch 'net-current/master'
projects / karo-tx-linux.git / log