]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 14 Oct 2011 06:16:30 +0000 (17:16 +1100)]
Merge remote-tracking branch 'kvmtool/master'
Conflicts:
include/net/9p/9p.h
Stephen Rothwell [Fri, 14 Oct 2011 06:01:59 +0000 (17:01 +1100)]
Merge remote-tracking branch 'moduleh/for-sfr'
Conflicts:
arch/arm/mach-bcmring/mm.c
arch/arm/plat-s3c24xx/devs.c
arch/arm/plat-s5p/dev-ehci.c
arch/arm/plat-s5p/dev-onenand.c
arch/arm/plat-samsung/dev-adc.c
arch/arm/plat-samsung/dev-asocdma.c
arch/arm/plat-samsung/dev-ide.c
arch/arm/plat-samsung/dev-nand.c
arch/arm/plat-samsung/dev-pwm.c
arch/arm/plat-samsung/dev-rtc.c
arch/arm/plat-samsung/dev-ts.c
arch/arm/plat-samsung/dev-usb.c
arch/arm/plat-samsung/dev-wdt.c
drivers/gpio/gpio-ml-ioh.c
drivers/gpio/gpio-pch.c
drivers/media/dvb/frontends/dibx000_common.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
drivers/scsi/libfc/fc_lport.c
drivers/staging/brcm80211/brcmfmac/bcmsdh.c
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
drivers/staging/iio/industrialio-ring.c
include/linux/dmaengine.h
sound/soc/soc-io.c
Stephen Rothwell [Fri, 14 Oct 2011 05:45:29 +0000 (16:45 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Conflicts:
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/core.c
Stephen Rothwell [Fri, 14 Oct 2011 05:44:05 +0000 (16:44 +1100)]
Merge remote-tracking branch 'hwspinlock/linux-next'
Conflicts:
arch/arm/mach-omap2/hwspinlock.c
Stephen Rothwell [Fri, 14 Oct 2011 05:37:46 +0000 (16:37 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Fri, 14 Oct 2011 05:32:30 +0000 (16:32 +1100)]
Merge remote-tracking branch 'tmem/tmem'
Stephen Rothwell [Fri, 14 Oct 2011 05:28:18 +0000 (16:28 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/Kconfig
drivers/Makefile
drivers/misc/altera-stapl/altera.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/et131x/et1310_tx.c
drivers/staging/hv/Makefile
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
drivers/staging/zram/zram_drv.c
Stephen Rothwell [Fri, 14 Oct 2011 05:19:58 +0000 (16:19 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
arch/arm/mach-omap2/Makefile
Stephen Rothwell [Fri, 14 Oct 2011 05:17:54 +0000 (16:17 +1100)]
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, 14 Oct 2011 05:11:10 +0000 (16:11 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
arch/arm/plat-mxc/devices.c
Stephen Rothwell [Fri, 14 Oct 2011 05:09:42 +0000 (16:09 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Conflicts:
drivers/mfd/wm831x-spi.c
Stephen Rothwell [Fri, 14 Oct 2011 05:08:08 +0000 (16:08 +1100)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Fri, 14 Oct 2011 05:06:41 +0000 (16:06 +1100)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Fri, 14 Oct 2011 05:05:07 +0000 (16:05 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 04:59:14 +0000 (15:59 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Fri, 14 Oct 2011 04:53:30 +0000 (15:53 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Fri, 14 Oct 2011 04:47:22 +0000 (15:47 +1100)]
Merge remote-tracking branch 'ptrace/ptrace'
Conflicts:
arch/sparc/kernel/signal32.c
arch/sparc/kernel/signal_32.c
arch/sparc/kernel/signal_64.c
Stephen Rothwell [Fri, 14 Oct 2011 04:15:16 +0000 (15:15 +1100)]
Merge remote-tracking branch 'kvm/kvm-updates/3.2'
Stephen Rothwell [Fri, 14 Oct 2011 04:08:55 +0000 (15:08 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Fri, 14 Oct 2011 04:02:17 +0000 (15:02 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 14 Oct 2011 03:55:35 +0000 (14:55 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/iommu/Makefile
Stephen Rothwell [Fri, 14 Oct 2011 03:54:07 +0000 (14:54 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Fri, 14 Oct 2011 03:52:45 +0000 (14:52 +1100)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Fri, 14 Oct 2011 03:50:19 +0000 (14:50 +1100)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Fri, 14 Oct 2011 03:48:59 +0000 (14:48 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:47:40 +0000 (14:47 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Fri, 14 Oct 2011 03:44:32 +0000 (14:44 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:43:08 +0000 (14:43 +1100)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:36:39 +0000 (14:36 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
Stephen Rothwell [Fri, 14 Oct 2011 03:32:23 +0000 (14:32 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/ide/Kconfig
drivers/net/Kconfig
Stephen Rothwell [Fri, 14 Oct 2011 03:25:06 +0000 (14:25 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:19:09 +0000 (14:19 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 14 Oct 2011 03:17:49 +0000 (14:17 +1100)]
Merge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Fri, 14 Oct 2011 03:17:39 +0000 (14:17 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 14 Oct 2011 03:10:55 +0000 (14:10 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Fri, 14 Oct 2011 03:09:24 +0000 (14:09 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:08:03 +0000 (14:08 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-rx51.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Stephen Rothwell [Fri, 14 Oct 2011 03:03:25 +0000 (14:03 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Conflicts:
drivers/video/Kconfig
Stephen Rothwell [Fri, 14 Oct 2011 03:01:48 +0000 (14:01 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Fri, 14 Oct 2011 03:00:21 +0000 (14:00 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-u300/include/mach/irqs.h
Stephen Rothwell [Fri, 14 Oct 2011 02:58:54 +0000 (13:58 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:52:22 +0000 (13:52 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:52:12 +0000 (13:52 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:50:50 +0000 (13:50 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/mmc/host/au1xmmc.c
Stephen Rothwell [Fri, 14 Oct 2011 02:50:39 +0000 (13:50 +1100)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Fri, 14 Oct 2011 02:48:31 +0000 (13:48 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:47:01 +0000 (13:47 +1100)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Fri, 14 Oct 2011 02:44:51 +0000 (13:44 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:43:02 +0000 (13:43 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 14 Oct 2011 02:41:34 +0000 (13:41 +1100)]
Merge branch 'quilt/rr'
Stephen Rothwell [Fri, 14 Oct 2011 02:40:14 +0000 (13:40 +1100)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Fri, 14 Oct 2011 02:38:54 +0000 (13:38 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:36:35 +0000 (13:36 +1100)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/arm/plat-omap/devices.c
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig
Stephen Rothwell [Fri, 14 Oct 2011 02:30:52 +0000 (13:30 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:29:31 +0000 (13:29 +1100)]
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
drivers/mtd/maps/lantiq-flash.c
Stephen Rothwell [Fri, 14 Oct 2011 02:28:13 +0000 (13:28 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c
Stephen Rothwell [Fri, 14 Oct 2011 02:26:28 +0000 (13:26 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:19:42 +0000 (13:19 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Fri, 14 Oct 2011 02:14:27 +0000 (13:14 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 14 Oct 2011 02:12:15 +0000 (13:12 +1100)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:12:10 +0000 (13:12 +1100)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:12:03 +0000 (13:12 +1100)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:10:43 +0000 (13:10 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:09:02 +0000 (13:09 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:07:43 +0000 (13:07 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 14 Oct 2011 02:07:38 +0000 (13:07 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:06:11 +0000 (13:06 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 02:04:27 +0000 (13:04 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 14 Oct 2011 02:03:08 +0000 (13:03 +1100)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Fri, 14 Oct 2011 02:01:55 +0000 (13:01 +1100)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Fri, 14 Oct 2011 02:00:33 +0000 (13:00 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:59:21 +0000 (12:59 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 14 Oct 2011 01:58:02 +0000 (12:58 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Fri, 14 Oct 2011 01:56:50 +0000 (12:56 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 14 Oct 2011 01:55:32 +0000 (12:55 +1100)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-wacom.c
Stephen Rothwell [Fri, 14 Oct 2011 01:54:01 +0000 (12:54 +1100)]
Merge remote-tracking branch 'xfs/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:52:46 +0000 (12:52 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:51:20 +0000 (12:51 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:45:14 +0000 (12:45 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:44:00 +0000 (12:44 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:42:43 +0000 (12:42 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:41:13 +0000 (12:41 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 14 Oct 2011 01:39:55 +0000 (12:39 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Fri, 14 Oct 2011 01:38:31 +0000 (12:38 +1100)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:37:10 +0000 (12:37 +1100)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:35:59 +0000 (12:35 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:34:45 +0000 (12:34 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 14 Oct 2011 01:33:31 +0000 (12:33 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 14 Oct 2011 01:32:16 +0000 (12:32 +1100)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Fri, 14 Oct 2011 01:31:05 +0000 (12:31 +1100)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Fri, 14 Oct 2011 01:24:38 +0000 (12:24 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 14 Oct 2011 01:23:19 +0000 (12:23 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Fri, 14 Oct 2011 01:16:52 +0000 (12:16 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 14 Oct 2011 01:15:40 +0000 (12:15 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:14:19 +0000 (12:14 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:13:00 +0000 (12:13 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:11:48 +0000 (12:11 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Fri, 14 Oct 2011 01:10:33 +0000 (12:10 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Fri, 14 Oct 2011 01:09:09 +0000 (12:09 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Fri, 14 Oct 2011 01:07:45 +0000 (12:07 +1100)]
Merge remote-tracking branch 'cris/for-next'
projects / karo-tx-linux.git / log