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