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