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