]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 23 Sep 2011 05:03:24 +0000 (15:03 +1000)]
Merge remote-tracking branch 'moduleh/module.h-split'
Conflicts:
arch/arm/mach-bcmring/mm.c
arch/powerpc/mm/tlb_nohash.c
drivers/mmc/host/sdhci-pci.c
drivers/s390/char/vmur.c
drivers/scsi/libfc/fc_lport.c
include/linux/dmaengine.h
Stephen Rothwell [Fri, 23 Sep 2011 04:51:50 +0000 (14:51 +1000)]
Merge remote-tracking branch 'hwspinlock/linux-next'
Stephen Rothwell [Fri, 23 Sep 2011 04:50:29 +0000 (14:50 +1000)]
Merge remote-tracking branch 'writeback/next'
Stephen Rothwell [Fri, 23 Sep 2011 04:45:27 +0000 (14:45 +1000)]
Merge remote-tracking branch 'tmem/tmem'
Conflicts:
mm/cleancache.c
Stephen Rothwell [Fri, 23 Sep 2011 04:41:20 +0000 (14:41 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
Stephen Rothwell [Fri, 23 Sep 2011 04:36:47 +0000 (14:36 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Fri, 23 Sep 2011 04:34:50 +0000 (14:34 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/udbg.c
drivers/tty/serial/8250.c
Stephen Rothwell [Fri, 23 Sep 2011 04:28:18 +0000 (14:28 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
arch/arm/plat-mxc/devices.c
Stephen Rothwell [Fri, 23 Sep 2011 04:26:54 +0000 (14:26 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Conflicts:
drivers/mfd/wm831x-spi.c
Stephen Rothwell [Fri, 23 Sep 2011 04:25:26 +0000 (14:25 +1000)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Fri, 23 Sep 2011 04:24:03 +0000 (14:24 +1000)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Fri, 23 Sep 2011 04:22:33 +0000 (14:22 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 04:21:13 +0000 (14:21 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Fri, 23 Sep 2011 04:08:59 +0000 (14:08 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Fri, 23 Sep 2011 04:03:02 +0000 (14:03 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Fri, 23 Sep 2011 04:01:40 +0000 (14:01 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
include/linux/kvm.h
Stephen Rothwell [Fri, 23 Sep 2011 03:55:03 +0000 (13:55 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 23 Sep 2011 03:48:34 +0000 (13:48 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Fri, 23 Sep 2011 03:47:16 +0000 (13:47 +1000)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Fri, 23 Sep 2011 03:45:58 +0000 (13:45 +1000)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Fri, 23 Sep 2011 03:43:40 +0000 (13:43 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Fri, 23 Sep 2011 03:42:21 +0000 (13:42 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:41:03 +0000 (13:41 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Fri, 23 Sep 2011 03:38:11 +0000 (13:38 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:36:49 +0000 (13:36 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:30:33 +0000 (13:30 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
Stephen Rothwell [Fri, 23 Sep 2011 03:26:26 +0000 (13:26 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/net/Kconfig
Stephen Rothwell [Fri, 23 Sep 2011 03:24:05 +0000 (13:24 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:22:41 +0000 (13:22 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 23 Sep 2011 03:22:29 +0000 (13:22 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 23 Sep 2011 03:21:47 +0000 (13:21 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:19:12 +0000 (13:19 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Fri, 23 Sep 2011 03:17:48 +0000 (13:17 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:16:29 +0000 (13:16 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Stephen Rothwell [Fri, 23 Sep 2011 03:14:20 +0000 (13:14 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:12:58 +0000 (13:12 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:11:30 +0000 (13:11 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:10:09 +0000 (13:10 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:03:48 +0000 (13:03 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:03:39 +0000 (13:03 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 23 Sep 2011 03:02:18 +0000 (13:02 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
Stephen Rothwell [Fri, 23 Sep 2011 03:02:07 +0000 (13:02 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Fri, 23 Sep 2011 03:00:19 +0000 (13:00 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 23 Sep 2011 02:58:47 +0000 (12:58 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Fri, 23 Sep 2011 02:56:39 +0000 (12:56 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 02:54:53 +0000 (12:54 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 23 Sep 2011 02:53:34 +0000 (12:53 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Fri, 23 Sep 2011 02:52:16 +0000 (12:52 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Fri, 23 Sep 2011 02:49:30 +0000 (12:49 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 02:47:53 +0000 (12:47 +1000)]
Merge commit 'refs/next/
20110922/sound'
Stephen Rothwell [Fri, 23 Sep 2011 02:16:52 +0000 (12:16 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 23 Sep 2011 02:15:33 +0000 (12:15 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c
Stephen Rothwell [Fri, 23 Sep 2011 02:00:13 +0000 (12:00 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 23 Sep 2011 01:58:37 +0000 (11:58 +1000)]
Merge remote-tracking branch 'wireless/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
Stephen Rothwell [Fri, 23 Sep 2011 01:52:59 +0000 (11:52 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Fri, 23 Sep 2011 01:47:10 +0000 (11:47 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 23 Sep 2011 01:45:03 +0000 (11:45 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Fri, 23 Sep 2011 01:44:59 +0000 (11:44 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Fri, 23 Sep 2011 01:44:53 +0000 (11:44 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Fri, 23 Sep 2011 01:43:36 +0000 (11:43 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 01:42:15 +0000 (11:42 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 01:40:58 +0000 (11:40 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 23 Sep 2011 01:40:53 +0000 (11:40 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 01:39:33 +0000 (11:39 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 01:27:30 +0000 (11:27 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Fri, 23 Sep 2011 01:26:20 +0000 (11:26 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Fri, 23 Sep 2011 01:24:59 +0000 (11:24 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 23 Sep 2011 01:23:48 +0000 (11:23 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 23 Sep 2011 01:22:29 +0000 (11:22 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Fri, 23 Sep 2011 01:21:18 +0000 (11:21 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 23 Sep 2011 01:19:58 +0000 (11:19 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 01:18:31 +0000 (11:18 +1000)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c
Stephen Rothwell [Fri, 23 Sep 2011 01:17:19 +0000 (11:17 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 01:15:52 +0000 (11:15 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 23 Sep 2011 01:09:56 +0000 (11:09 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 23 Sep 2011 01:08:42 +0000 (11:08 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 23 Sep 2011 01:07:27 +0000 (11:07 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 23 Sep 2011 01:06:08 +0000 (11:06 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 23 Sep 2011 01:04:50 +0000 (11:04 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 01:03:39 +0000 (11:03 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Fri, 23 Sep 2011 01:02:28 +0000 (11:02 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 23 Sep 2011 01:01:16 +0000 (11:01 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 23 Sep 2011 01:00:04 +0000 (11:00 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Fri, 23 Sep 2011 00:58:52 +0000 (10:58 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Fri, 23 Sep 2011 00:52:35 +0000 (10:52 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 23 Sep 2011 00:51:19 +0000 (10:51 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Fri, 23 Sep 2011 00:45:03 +0000 (10:45 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 23 Sep 2011 00:43:45 +0000 (10:43 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 23 Sep 2011 00:42:26 +0000 (10:42 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 00:41:15 +0000 (10:41 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 00:39:57 +0000 (10:39 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Fri, 23 Sep 2011 00:38:39 +0000 (10:38 +1000)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Fri, 23 Sep 2011 00:37:23 +0000 (10:37 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Fri, 23 Sep 2011 00:36:11 +0000 (10:36 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Fri, 23 Sep 2011 00:36:10 +0000 (10:36 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'
Conflicts:
arch/arm/mach-ux500/cache-l2x0.c
Stephen Rothwell [Fri, 23 Sep 2011 00:25:28 +0000 (10:25 +1000)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
drivers/gpio/Makefile
Stephen Rothwell [Fri, 23 Sep 2011 00:24:10 +0000 (10:24 +1000)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/Makefile
Stephen Rothwell [Fri, 23 Sep 2011 00:22:47 +0000 (10:22 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Fri, 23 Sep 2011 00:21:33 +0000 (10:21 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
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-nuc93x/Makefile.boot
arch/arm/mach-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/plat-mxc/include/mach/gpio.h
Stephen Rothwell [Fri, 23 Sep 2011 00:14:57 +0000 (10:14 +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
projects / karo-tx-linux.git / log