]>
git.kernelconcepts.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 22 Sep 2011 07:52:54 +0000 (17:52 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
Stephen Rothwell [Thu, 22 Sep 2011 07:48:51 +0000 (17:48 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Thu, 22 Sep 2011 07:46:53 +0000 (17:46 +1000)]
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, 22 Sep 2011 07:40:24 +0000 (17:40 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
arch/arm/plat-mxc/devices.c
Stephen Rothwell [Thu, 22 Sep 2011 07:39:01 +0000 (17:39 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Conflicts:
drivers/mfd/wm831x-spi.c
Stephen Rothwell [Thu, 22 Sep 2011 07:37:34 +0000 (17:37 +1000)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Thu, 22 Sep 2011 07:36:11 +0000 (17:36 +1000)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Thu, 22 Sep 2011 07:34:41 +0000 (17:34 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 07:33:24 +0000 (17:33 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 07:31:58 +0000 (17:31 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Thu, 22 Sep 2011 07:26:30 +0000 (17:26 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Thu, 22 Sep 2011 07:20:36 +0000 (17:20 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Thu, 22 Sep 2011 07:19:12 +0000 (17:19 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
include/linux/kvm.h
Stephen Rothwell [Thu, 22 Sep 2011 07:12:42 +0000 (17:12 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 22 Sep 2011 07:06:18 +0000 (17:06 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 22 Sep 2011 07:05:01 +0000 (17:05 +1000)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Thu, 22 Sep 2011 07:03:42 +0000 (17:03 +1000)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Thu, 22 Sep 2011 07:02:23 +0000 (17:02 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Thu, 22 Sep 2011 07:01:06 +0000 (17:01 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Thu, 22 Sep 2011 06:59:19 +0000 (16:59 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Thu, 22 Sep 2011 06:56:36 +0000 (16:56 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:55:14 +0000 (16:55 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:49:01 +0000 (16:49 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
Stephen Rothwell [Thu, 22 Sep 2011 06:44:56 +0000 (16:44 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/net/Kconfig
Stephen Rothwell [Thu, 22 Sep 2011 06:33:57 +0000 (16:33 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:32:33 +0000 (16:32 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 22 Sep 2011 06:32:21 +0000 (16:32 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 22 Sep 2011 06:31:40 +0000 (16:31 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:29:04 +0000 (16:29 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Thu, 22 Sep 2011 06:27:41 +0000 (16:27 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:26:24 +0000 (16:26 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Stephen Rothwell [Thu, 22 Sep 2011 06:23:41 +0000 (16:23 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:22:19 +0000 (16:22 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:20:51 +0000 (16:20 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:19:31 +0000 (16:19 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:13:12 +0000 (16:13 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:13:03 +0000 (16:13 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 22 Sep 2011 06:10:52 +0000 (16:10 +1000)]
Merge commit 'refs/next/
20110921/mmc'
Stephen Rothwell [Thu, 22 Sep 2011 05:51:21 +0000 (15:51 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Thu, 22 Sep 2011 05:49:35 +0000 (15:49 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 22 Sep 2011 05:48:02 +0000 (15:48 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 22 Sep 2011 05:45:55 +0000 (15:45 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 05:42:53 +0000 (15:42 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 22 Sep 2011 05:41:34 +0000 (15:41 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Thu, 22 Sep 2011 05:40:17 +0000 (15:40 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Thu, 22 Sep 2011 05:38:51 +0000 (15:38 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 05:36:50 +0000 (15:36 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 05:31:33 +0000 (15:31 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 22 Sep 2011 05:30:14 +0000 (15:30 +1000)]
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 [Thu, 22 Sep 2011 05:17:47 +0000 (15:17 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 22 Sep 2011 05:16:11 +0000 (15:16 +1000)]
Merge remote-tracking branch 'wireless/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
Stephen Rothwell [Thu, 22 Sep 2011 05:10:37 +0000 (15:10 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
MAINTAINERS
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Thu, 22 Sep 2011 03:21:23 +0000 (13:21 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 22 Sep 2011 03:19:17 +0000 (13:19 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Thu, 22 Sep 2011 03:19:13 +0000 (13:19 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Thu, 22 Sep 2011 03:19:07 +0000 (13:19 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Thu, 22 Sep 2011 03:17:50 +0000 (13:17 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 03:16:27 +0000 (13:16 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 03:15:10 +0000 (13:15 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 22 Sep 2011 03:15:05 +0000 (13:15 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 03:13:42 +0000 (13:13 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 03:02:59 +0000 (13:02 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Thu, 22 Sep 2011 03:01:48 +0000 (13:01 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Thu, 22 Sep 2011 03:00:27 +0000 (13:00 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:59:16 +0000 (12:59 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 22 Sep 2011 02:57:55 +0000 (12:57 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Thu, 22 Sep 2011 02:56:44 +0000 (12:56 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Thu, 22 Sep 2011 02:55:24 +0000 (12:55 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:53:57 +0000 (12:53 +1000)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c
Stephen Rothwell [Thu, 22 Sep 2011 02:52:45 +0000 (12:52 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:51:17 +0000 (12:51 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:45:19 +0000 (12:45 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:44:05 +0000 (12:44 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 22 Sep 2011 02:42:52 +0000 (12:42 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 22 Sep 2011 02:41:32 +0000 (12:41 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 22 Sep 2011 02:40:12 +0000 (12:40 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:39:01 +0000 (12:39 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Thu, 22 Sep 2011 02:37:51 +0000 (12:37 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 22 Sep 2011 02:36:38 +0000 (12:36 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 22 Sep 2011 02:35:27 +0000 (12:35 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Thu, 22 Sep 2011 02:34:15 +0000 (12:34 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Thu, 22 Sep 2011 02:27:59 +0000 (12:27 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 22 Sep 2011 02:26:42 +0000 (12:26 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Thu, 22 Sep 2011 02:20:25 +0000 (12:20 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 22 Sep 2011 02:19:04 +0000 (12:19 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:17:45 +0000 (12:17 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:16:35 +0000 (12:16 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:15:21 +0000 (12:15 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Thu, 22 Sep 2011 02:14:04 +0000 (12:14 +1000)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Thu, 22 Sep 2011 02:12:47 +0000 (12:12 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 22 Sep 2011 02:11:31 +0000 (12:11 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Thu, 22 Sep 2011 02:11:29 +0000 (12:11 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Thu, 22 Sep 2011 02:08:13 +0000 (12:08 +1000)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
drivers/gpio/Makefile
Stephen Rothwell [Thu, 22 Sep 2011 01:51:47 +0000 (11:51 +1000)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/Makefile
Stephen Rothwell [Thu, 22 Sep 2011 01:50:25 +0000 (11:50 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Thu, 22 Sep 2011 01:49:12 +0000 (11:49 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/boot/dts/tegra-harmony.dts
arch/arm/boot/dts/tegra-seaboard.dts
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-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/plat-mxc/include/mach/gpio.h
Stephen Rothwell [Thu, 22 Sep 2011 01:43:25 +0000 (11:43 +1000)]
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, 22 Sep 2011 01:42:07 +0000 (11:42 +1000)]
Merge remote-tracking branch 'arm/for-next'
Conflicts:
arch/arm/mach-integrator/integrator_ap.c
Stephen Rothwell [Thu, 22 Sep 2011 01:40:56 +0000 (11:40 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Thu, 22 Sep 2011 01:40:43 +0000 (11:40 +1000)]
Merge remote-tracking branch 'wireless-current/master'
projects / karo-tx-linux.git / log