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