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