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