]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 13 Oct 2011 05:08:23 +0000 (16:08 +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 [Thu, 13 Oct 2011 05:01:44 +0000 (16:01 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
arch/arm/plat-mxc/devices.c
Stephen Rothwell [Thu, 13 Oct 2011 05:00:18 +0000 (16:00 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Conflicts:
drivers/mfd/wm831x-spi.c
Stephen Rothwell [Thu, 13 Oct 2011 04:58:49 +0000 (15:58 +1100)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Thu, 13 Oct 2011 04:57:25 +0000 (15:57 +1100)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Thu, 13 Oct 2011 04:55:55 +0000 (15:55 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 04:54:29 +0000 (15:54 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Thu, 13 Oct 2011 04:48:48 +0000 (15:48 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Thu, 13 Oct 2011 04:42:37 +0000 (15:42 +1100)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Thu, 13 Oct 2011 04:36:55 +0000 (15:36 +1100)]
Merge remote-tracking branch 'kvm/kvm-updates/3.2'
Stephen Rothwell [Thu, 13 Oct 2011 04:30:33 +0000 (15:30 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Thu, 13 Oct 2011 04:23:50 +0000 (15:23 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 13 Oct 2011 04:17:12 +0000 (15:17 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/iommu/Makefile
Stephen Rothwell [Thu, 13 Oct 2011 04:15:37 +0000 (15:15 +1100)]
Merge commit 'refs/next/
20111005/gpio'
Stephen Rothwell [Thu, 13 Oct 2011 03:43:04 +0000 (14:43 +1100)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Thu, 13 Oct 2011 03:40:39 +0000 (14:40 +1100)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Thu, 13 Oct 2011 03:39:19 +0000 (14:39 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 03:37:59 +0000 (14:37 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Thu, 13 Oct 2011 03:35:03 +0000 (14:35 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 03:33:38 +0000 (14:33 +1100)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 03:27:12 +0000 (14:27 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
Stephen Rothwell [Thu, 13 Oct 2011 03:22:55 +0000 (14:22 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/net/Kconfig
Stephen Rothwell [Thu, 13 Oct 2011 03:12:03 +0000 (14:12 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 13 Oct 2011 03:06:06 +0000 (14:06 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 13 Oct 2011 03:04:43 +0000 (14:04 +1100)]
Merge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Thu, 13 Oct 2011 03:04:33 +0000 (14:04 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 13 Oct 2011 03:03:52 +0000 (14:03 +1100)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Thu, 13 Oct 2011 02:57:10 +0000 (13:57 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Thu, 13 Oct 2011 02:55:44 +0000 (13:55 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 02:54:22 +0000 (13:54 +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 [Thu, 13 Oct 2011 02:51:42 +0000 (13:51 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Conflicts:
drivers/video/Kconfig
Stephen Rothwell [Thu, 13 Oct 2011 02:50:08 +0000 (13:50 +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 [Thu, 13 Oct 2011 02:48:41 +0000 (13:48 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 02:42:07 +0000 (13:42 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 02:41:58 +0000 (13:41 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 13 Oct 2011 02:40:35 +0000 (13:40 +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 [Thu, 13 Oct 2011 02:40:24 +0000 (13:40 +1100)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Thu, 13 Oct 2011 02:38:34 +0000 (13:38 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 13 Oct 2011 02:37:04 +0000 (13:37 +1100)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 13 Oct 2011 02:34:53 +0000 (13:34 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 02:33:03 +0000 (13:33 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 13 Oct 2011 02:31:42 +0000 (13:31 +1100)]
Merge branch 'quilt/rr'
Stephen Rothwell [Thu, 13 Oct 2011 02:30:23 +0000 (13:30 +1100)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Thu, 13 Oct 2011 02:28:59 +0000 (13:28 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 02:26:41 +0000 (13:26 +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 [Thu, 13 Oct 2011 02:20:58 +0000 (13:20 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 13 Oct 2011 02:19:38 +0000 (13:19 +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 [Thu, 13 Oct 2011 02:09:39 +0000 (13:09 +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 [Thu, 13 Oct 2011 02:07:56 +0000 (13:07 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Thu, 13 Oct 2011 02:01:13 +0000 (13:01 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Thu, 13 Oct 2011 01:43:44 +0000 (12:43 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 13 Oct 2011 01:41:35 +0000 (12:41 +1100)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Thu, 13 Oct 2011 01:41:30 +0000 (12:41 +1100)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Thu, 13 Oct 2011 01:41:24 +0000 (12:41 +1100)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Thu, 13 Oct 2011 01:40:06 +0000 (12:40 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 01:38:29 +0000 (12:38 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 01:37:10 +0000 (12:37 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 13 Oct 2011 01:37:07 +0000 (12:37 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 01:35:40 +0000 (12:35 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 01:33:55 +0000 (12:33 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 13 Oct 2011 01:32:35 +0000 (12:32 +1100)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Thu, 13 Oct 2011 01:31:23 +0000 (12:31 +1100)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Thu, 13 Oct 2011 01:30:02 +0000 (12:30 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 13 Oct 2011 01:28:50 +0000 (12:28 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 13 Oct 2011 01:27:31 +0000 (12:27 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Thu, 13 Oct 2011 01:26:19 +0000 (12:26 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Thu, 13 Oct 2011 01:24:59 +0000 (12:24 +1100)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-wacom.c
Stephen Rothwell [Thu, 13 Oct 2011 01:23:29 +0000 (12:23 +1100)]
Merge remote-tracking branch 'xfs/master'
Stephen Rothwell [Thu, 13 Oct 2011 01:22:16 +0000 (12:22 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 01:20:49 +0000 (12:20 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 13 Oct 2011 01:14:42 +0000 (12:14 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 13 Oct 2011 01:13:27 +0000 (12:13 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 13 Oct 2011 01:12:12 +0000 (12:12 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 13 Oct 2011 01:10:45 +0000 (12:10 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 13 Oct 2011 01:09:21 +0000 (12:09 +1100)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Thu, 13 Oct 2011 01:08:01 +0000 (12:08 +1100)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 01:06:49 +0000 (12:06 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Thu, 13 Oct 2011 01:05:37 +0000 (12:05 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 13 Oct 2011 01:04:16 +0000 (12:04 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 13 Oct 2011 01:03:01 +0000 (12:03 +1100)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Thu, 13 Oct 2011 01:01:48 +0000 (12:01 +1100)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Thu, 13 Oct 2011 00:55:21 +0000 (11:55 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 13 Oct 2011 00:54:03 +0000 (11:54 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Thu, 13 Oct 2011 00:47:34 +0000 (11:47 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 13 Oct 2011 00:46:21 +0000 (11:46 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 00:45:00 +0000 (11:45 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 13 Oct 2011 00:43:41 +0000 (11:43 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 00:42:29 +0000 (11:42 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 00:41:09 +0000 (11:41 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 13 Oct 2011 00:39:50 +0000 (11:39 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Thu, 13 Oct 2011 00:38:32 +0000 (11:38 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 00:32:06 +0000 (11:32 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Thu, 13 Oct 2011 00:30:55 +0000 (11:30 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Thu, 13 Oct 2011 00:29:35 +0000 (11:29 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Thu, 13 Oct 2011 00:26:14 +0000 (11:26 +1100)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile
Stephen Rothwell [Thu, 13 Oct 2011 00:24:51 +0000 (11:24 +1100)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-mx5/mm.c
Stephen Rothwell [Thu, 13 Oct 2011 00:23:26 +0000 (11:23 +1100)]
Merge remote-tracking branch 'at91/at91-next'
Conflicts:
arch/arm/mach-at91/at91sam9g45.c
Stephen Rothwell [Thu, 13 Oct 2011 00:17:28 +0000 (11:17 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/kernel/smp.c
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-ep93xx/Makefile.boot
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-u300/Makefile.boot
arch/arm/plat-mxc/include/mach/gpio.h
arch/arm/plat-omap/Kconfig
Stephen Rothwell [Thu, 13 Oct 2011 00:01:42 +0000 (11:01 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
Stephen Rothwell [Thu, 13 Oct 2011 00:00:23 +0000 (11:00 +1100)]
Merge remote-tracking branch 'arm/for-next'
projects / karo-tx-linux.git / log