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