]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 19 Sep 2011 07:53:37 +0000 (17:53 +1000)]
Merge remote-tracking branch 'moduleh/module.h-split'
Conflicts:
arch/arm/mach-bcmring/mm.c
drivers/s390/char/vmur.c
drivers/scsi/libfc/fc_lport.c
include/linux/dmaengine.h
Stephen Rothwell [Mon, 19 Sep 2011 07:52:12 +0000 (17:52 +1000)]
Merge remote-tracking branch 'writeback/next'
Stephen Rothwell [Mon, 19 Sep 2011 07:47:14 +0000 (17:47 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Mon, 19 Sep 2011 07:43:16 +0000 (17:43 +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, 19 Sep 2011 07:40:15 +0000 (17:40 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Mon, 19 Sep 2011 07:38:12 +0000 (17:38 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Mon, 19 Sep 2011 07:31:46 +0000 (17:31 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
arch/arm/plat-mxc/devices.c
Stephen Rothwell [Mon, 19 Sep 2011 07:30:19 +0000 (17:30 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 07:28:57 +0000 (17:28 +1000)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Mon, 19 Sep 2011 07:27:34 +0000 (17:27 +1000)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Mon, 19 Sep 2011 07:26:07 +0000 (17:26 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 07:24:50 +0000 (17:24 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 07:23:26 +0000 (17:23 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Mon, 19 Sep 2011 07:17:58 +0000 (17:17 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Mon, 19 Sep 2011 07:12:06 +0000 (17:12 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Mon, 19 Sep 2011 07:10:38 +0000 (17:10 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 19 Sep 2011 07:04:15 +0000 (17:04 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Mon, 19 Sep 2011 06:57:54 +0000 (16:57 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 19 Sep 2011 06:57:45 +0000 (16:57 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Conflicts:
drivers/of/base.c
Stephen Rothwell [Mon, 19 Sep 2011 06:56:24 +0000 (16:56 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Mon, 19 Sep 2011 06:54:38 +0000 (16:54 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Mon, 19 Sep 2011 06:51:57 +0000 (16:51 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 06:50:36 +0000 (16:50 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 06:44:25 +0000 (16:44 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
Stephen Rothwell [Mon, 19 Sep 2011 06:40:20 +0000 (16:40 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/PCI/pci.txt
drivers/net/Kconfig
Stephen Rothwell [Mon, 19 Sep 2011 06:34:12 +0000 (16:34 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 19 Sep 2011 06:32:53 +0000 (16:32 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 19 Sep 2011 06:31:26 +0000 (16:31 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 19 Sep 2011 06:30:45 +0000 (16:30 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Mon, 19 Sep 2011 06:28:11 +0000 (16:28 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Mon, 19 Sep 2011 06:26:51 +0000 (16:26 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 06:25:29 +0000 (16:25 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 06:24:06 +0000 (16:24 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Mon, 19 Sep 2011 06:22:47 +0000 (16:22 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Conflicts:
drivers/video/Kconfig
Stephen Rothwell [Mon, 19 Sep 2011 06:17:34 +0000 (16:17 +1000)]
Merge commit 'refs/next/
20110915/mfd'
Conflicts:
drivers/rtc/rtc-twl.c
Stephen Rothwell [Mon, 19 Sep 2011 06:02:24 +0000 (16:02 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 05:56:11 +0000 (15:56 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 05:56:02 +0000 (15:56 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 19 Sep 2011 05:54:42 +0000 (15:54 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 19 Sep 2011 05:54:35 +0000 (15:54 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Mon, 19 Sep 2011 05:52:49 +0000 (15:52 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 19 Sep 2011 05:51:18 +0000 (15:51 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Mon, 19 Sep 2011 05:45:26 +0000 (15:45 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 05:43:43 +0000 (15:43 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 19 Sep 2011 05:42:13 +0000 (15:42 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Mon, 19 Sep 2011 05:40:57 +0000 (15:40 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Mon, 19 Sep 2011 05:39:31 +0000 (15:39 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 05:37:38 +0000 (15:37 +1000)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig
Stephen Rothwell [Mon, 19 Sep 2011 05:19:02 +0000 (15:19 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 19 Sep 2011 05:17:44 +0000 (15:17 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
Stephen Rothwell [Mon, 19 Sep 2011 05:15:56 +0000 (15:15 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 19 Sep 2011 05:14:20 +0000 (15:14 +1000)]
Merge remote-tracking branch 'wireless/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Stephen Rothwell [Mon, 19 Sep 2011 04:49:29 +0000 (14:49 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
MAINTAINERS
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Mon, 19 Sep 2011 04:31:55 +0000 (14:31 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 19 Sep 2011 04:29:50 +0000 (14:29 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Mon, 19 Sep 2011 04:29:46 +0000 (14:29 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Mon, 19 Sep 2011 04:29:40 +0000 (14:29 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Mon, 19 Sep 2011 04:28:23 +0000 (14:28 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 04:26:59 +0000 (14:26 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 19 Sep 2011 04:26:54 +0000 (14:26 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 04:25:30 +0000 (14:25 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 04:24:10 +0000 (14:24 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Mon, 19 Sep 2011 04:22:57 +0000 (14:22 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Mon, 19 Sep 2011 04:21:37 +0000 (14:21 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 19 Sep 2011 04:20:26 +0000 (14:20 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Mon, 19 Sep 2011 04:19:06 +0000 (14:19 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Mon, 19 Sep 2011 04:17:55 +0000 (14:17 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Mon, 19 Sep 2011 04:16:35 +0000 (14:16 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 04:15:07 +0000 (14:15 +1000)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c
Stephen Rothwell [Mon, 19 Sep 2011 04:13:55 +0000 (14:13 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Conflicts:
net/9p/trans_virtio.c
Stephen Rothwell [Mon, 19 Sep 2011 04:12:26 +0000 (14:12 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 19 Sep 2011 04:06:30 +0000 (14:06 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 19 Sep 2011 04:05:18 +0000 (14:05 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 19 Sep 2011 04:04:04 +0000 (14:04 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 19 Sep 2011 04:02:46 +0000 (14:02 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 19 Sep 2011 04:01:30 +0000 (14:01 +1000)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Mon, 19 Sep 2011 04:00:16 +0000 (14:00 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 03:59:05 +0000 (13:59 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Mon, 19 Sep 2011 03:57:54 +0000 (13:57 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Mon, 19 Sep 2011 03:56:42 +0000 (13:56 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 19 Sep 2011 03:55:31 +0000 (13:55 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Mon, 19 Sep 2011 03:54:21 +0000 (13:54 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Mon, 19 Sep 2011 03:48:08 +0000 (13:48 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 19 Sep 2011 03:46:52 +0000 (13:46 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Mon, 19 Sep 2011 03:45:38 +0000 (13:45 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Mon, 19 Sep 2011 03:44:17 +0000 (13:44 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 19 Sep 2011 03:42:59 +0000 (13:42 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 03:41:47 +0000 (13:41 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 03:40:33 +0000 (13:40 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Mon, 19 Sep 2011 03:39:17 +0000 (13:39 +1000)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Mon, 19 Sep 2011 03:38:00 +0000 (13:38 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 03:36:49 +0000 (13:36 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Mon, 19 Sep 2011 03:35:38 +0000 (13:35 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Mon, 19 Sep 2011 03:34:24 +0000 (13:34 +1000)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c
Stephen Rothwell [Mon, 19 Sep 2011 02:37:25 +0000 (12:37 +1000)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/Makefile
Stephen Rothwell [Mon, 19 Sep 2011 02:37:18 +0000 (12:37 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Mon, 19 Sep 2011 02:36:05 +0000 (12:36 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
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/mm/cache-l2x0.c
arch/arm/plat-mxc/include/mach/gpio.h
Stephen Rothwell [Mon, 19 Sep 2011 02:22:11 +0000 (12:22 +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, 19 Sep 2011 02:20:54 +0000 (12:20 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 19 Sep 2011 02:19:42 +0000 (12:19 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
projects / karo-tx-linux.git / log