]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Tue, 25 Oct 2011 08:27:11 +0000 (19:27 +1100)]
Merge remote-tracking branch 'tmem/tmem'
Stephen Rothwell [Tue, 25 Oct 2011 08:27:03 +0000 (19:27 +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/et131x/et131x_netdev.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 [Tue, 25 Oct 2011 08:19:05 +0000 (19:19 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
arch/arm/mach-omap2/Makefile
Stephen Rothwell [Tue, 25 Oct 2011 08:18:56 +0000 (19:18 +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
drivers/tty/serial/8250_pci.c
drivers/tty/serial/atmel_serial.c
Stephen Rothwell [Tue, 25 Oct 2011 08:07:40 +0000 (19:07 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
arch/arm/plat-mxc/devices.c
fs/sysfs/dir.c
Stephen Rothwell [Tue, 25 Oct 2011 07:45:45 +0000 (18:45 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Conflicts:
drivers/mfd/wm831x-spi.c
Stephen Rothwell [Tue, 25 Oct 2011 07:45:28 +0000 (18:45 +1100)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Tue, 25 Oct 2011 07:45:18 +0000 (18:45 +1100)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Tue, 25 Oct 2011 07:45:00 +0000 (18:45 +1100)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Tue, 25 Oct 2011 07:44:54 +0000 (18:44 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Tue, 25 Oct 2011 07:44:42 +0000 (18:44 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Tue, 25 Oct 2011 07:44:34 +0000 (18:44 +1100)]
Merge remote-tracking branch 'kvm/kvm-updates/3.2'
Stephen Rothwell [Tue, 25 Oct 2011 07:44:27 +0000 (18:44 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Tue, 25 Oct 2011 07:44:20 +0000 (18:44 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 25 Oct 2011 07:44:15 +0000 (18:44 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/iommu/Makefile
fs/proc/stat.c
include/asm-generic/cputime.h
kernel/sched_stats.h
Stephen Rothwell [Tue, 25 Oct 2011 07:21:30 +0000 (18:21 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Tue, 25 Oct 2011 07:21:23 +0000 (18:21 +1100)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Tue, 25 Oct 2011 07:21:17 +0000 (18:21 +1100)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Tue, 25 Oct 2011 07:21:10 +0000 (18:21 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 25 Oct 2011 07:21:06 +0000 (18:21 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Tue, 25 Oct 2011 07:20:31 +0000 (18:20 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Tue, 25 Oct 2011 07:20:20 +0000 (18:20 +1100)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Tue, 25 Oct 2011 07:20:16 +0000 (18:20 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
arch/s390/kernel/suspend.c
Stephen Rothwell [Tue, 25 Oct 2011 06:39:58 +0000 (17:39 +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 [Tue, 25 Oct 2011 06:38:57 +0000 (17:38 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Tue, 25 Oct 2011 06:38:51 +0000 (17:38 +1100)]
Merge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Tue, 25 Oct 2011 06:38:45 +0000 (17:38 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 25 Oct 2011 06:38:32 +0000 (17:38 +1100)]
Merge remote-tracking branch 'watchdog/linux-next'
Stephen Rothwell [Tue, 25 Oct 2011 06:38:23 +0000 (17:38 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Tue, 25 Oct 2011 06:38:10 +0000 (17:38 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 25 Oct 2011 06:38:01 +0000 (17:38 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-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/Kconfig
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Stephen Rothwell [Tue, 25 Oct 2011 06:35:55 +0000 (17:35 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Tue, 25 Oct 2011 06:35:46 +0000 (17:35 +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 [Tue, 25 Oct 2011 06:35:35 +0000 (17:35 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 25 Oct 2011 06:35:24 +0000 (17:35 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 25 Oct 2011 06:35:15 +0000 (17:35 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 25 Oct 2011 06:35:10 +0000 (17:35 +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 [Tue, 25 Oct 2011 06:28:17 +0000 (17:28 +1100)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Tue, 25 Oct 2011 06:27:37 +0000 (17:27 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Tue, 25 Oct 2011 06:27:21 +0000 (17:27 +1100)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Tue, 25 Oct 2011 06:27:15 +0000 (17:27 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 25 Oct 2011 06:27:03 +0000 (17:27 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 25 Oct 2011 06:26:57 +0000 (17:26 +1100)]
Merge branch 'quilt/rr'
Stephen Rothwell [Tue, 25 Oct 2011 06:26:51 +0000 (17:26 +1100)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Tue, 25 Oct 2011 06:26:44 +0000 (17:26 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 25 Oct 2011 06:26:39 +0000 (17: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 [Tue, 25 Oct 2011 06:26:28 +0000 (17:26 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 25 Oct 2011 06:26:24 +0000 (17:26 +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 [Tue, 25 Oct 2011 06:25:07 +0000 (17:25 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
net/bluetooth/l2cap_sock.c
Stephen Rothwell [Tue, 25 Oct 2011 06:17:57 +0000 (17:17 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Tue, 25 Oct 2011 06:16:05 +0000 (17:16 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 25 Oct 2011 06:16:02 +0000 (17:16 +1100)]
Merge remote-tracking branch 'iscsi-target/for-next'
Stephen Rothwell [Tue, 25 Oct 2011 06:15:58 +0000 (17:15 +1100)]
Merge remote-tracking branch 'scsi/master'
Conflicts:
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Mon, 24 Oct 2011 21:38:56 +0000 (08:38 +1100)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Mon, 24 Oct 2011 21:38:50 +0000 (08:38 +1100)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Mon, 24 Oct 2011 21:38:44 +0000 (08:38 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:38:35 +0000 (08:38 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:38:31 +0000 (08:38 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Conflicts:
drivers/ata/pata_at91.c
Stephen Rothwell [Mon, 24 Oct 2011 21:27:39 +0000 (08:27 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:35 +0000 (08:27 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:33 +0000 (08:27 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:31 +0000 (08:27 +1100)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:30 +0000 (08:27 +1100)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:28 +0000 (08:27 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:27 +0000 (08:27 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:25 +0000 (08:27 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:24 +0000 (08:27 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:22 +0000 (08:27 +1100)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-wacom.c
Stephen Rothwell [Mon, 24 Oct 2011 21:27:20 +0000 (08:27 +1100)]
Merge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:16 +0000 (08:27 +1100)]
Merge remote-tracking branch 'xfs/master'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:14 +0000 (08:27 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:12 +0000 (08:27 +1100)]
Merge remote-tracking branch 'squashfs/master'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:09 +0000 (08:27 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:07 +0000 (08:27 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:06 +0000 (08:27 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:27:03 +0000 (08:27 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 24 Oct 2011 21:26:59 +0000 (08:26 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 24 Oct 2011 21:26:56 +0000 (08:26 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 24 Oct 2011 21:26:54 +0000 (08:26 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 24 Oct 2011 21:26:50 +0000 (08:26 +1100)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Mon, 24 Oct 2011 21:26:47 +0000 (08:26 +1100)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:26:45 +0000 (08:26 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Mon, 24 Oct 2011 21:26:44 +0000 (08:26 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Mon, 24 Oct 2011 21:26:42 +0000 (08:26 +1100)]
Merge remote-tracking branch 'tile/master'
Conflicts:
arch/tile/kernel/intvec_32.S
arch/tile/lib/atomic_asm_32.S
Stephen Rothwell [Mon, 24 Oct 2011 21:25:21 +0000 (08:25 +1100)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Mon, 24 Oct 2011 21:25:19 +0000 (08:25 +1100)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Mon, 24 Oct 2011 21:25:18 +0000 (08:25 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 24 Oct 2011 21:25:11 +0000 (08:25 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Mon, 24 Oct 2011 21:25:09 +0000 (08:25 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Mon, 24 Oct 2011 21:25:07 +0000 (08:25 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:25:06 +0000 (08:25 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:25:04 +0000 (08:25 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Mon, 24 Oct 2011 21:25:03 +0000 (08:25 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:25:01 +0000 (08:25 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Mon, 24 Oct 2011 21:25:00 +0000 (08:25 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Mon, 24 Oct 2011 21:24:51 +0000 (08:24 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:24:49 +0000 (08:24 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:24:48 +0000 (08:24 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Mon, 24 Oct 2011 21:24:46 +0000 (08:24 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Mon, 24 Oct 2011 21:24:45 +0000 (08:24 +1100)]
Merge remote-tracking branch 's5p/for-next'
projects / karo-tx-linux.git / log