]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 18 Feb 2013 05:31:26 +0000 (16:31 +1100)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/mips/kernel/linux32.c
arch/mips/kernel/process.c
arch/mips/kernel/scall64-o32.S
arch/mips/kernel/signal.c
arch/mips/kernel/signal32.c
arch/mips/kernel/signal_n32.c
arch/mips/kernel/syscall.c
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/x86/Kconfig
Stephen Rothwell [Mon, 18 Feb 2013 05:29:55 +0000 (16:29 +1100)]
Merge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 05:28:07 +0000 (16:28 +1100)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
net/sunrpc/svcauth_unix.c
Stephen Rothwell [Mon, 18 Feb 2013 05:19:02 +0000 (16:19 +1100)]
Merge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 05:17:33 +0000 (16:17 +1100)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 05:16:04 +0000 (16:16 +1100)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Mon, 18 Feb 2013 05:14:35 +0000 (16:14 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 05:13:00 +0000 (16:13 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 05:11:23 +0000 (16:11 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Mon, 18 Feb 2013 05:11:14 +0000 (16:11 +1100)]
Merge remote-tracking branch 'ixp4xx/next'
Stephen Rothwell [Mon, 18 Feb 2013 05:11:10 +0000 (16:11 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Mon, 18 Feb 2013 05:09:39 +0000 (16:09 +1100)]
Merge remote-tracking branch 'cortex/for-next'
Conflicts:
arch/arm/include/asm/cputype.h
Stephen Rothwell [Mon, 18 Feb 2013 05:02:03 +0000 (16:02 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-zoom-peripherals.c
arch/arm/mach-s3c64xx/dma.c
arch/arm/mach-shmobile/setup-r8a7740.c
arch/arm/mach-shmobile/setup-sh73a0.c
arch/arm/mach-spear13xx/spear1340.c
arch/arm/mach-spear3xx/spear3xx.c
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/mach-zynq/common.c
drivers/clk/Makefile
drivers/clocksource/Kconfig
drivers/clocksource/Makefile
drivers/crypto/omap-sham.c
drivers/input/keyboard/tegra-kbc.c
drivers/irqchip/Makefile
drivers/mfd/db8500-prcmu.c
drivers/pinctrl/pinctrl-nomadik.c
Stephen Rothwell [Mon, 18 Feb 2013 04:54:23 +0000 (15:54 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 04:52:41 +0000 (15:52 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Mon, 18 Feb 2013 04:51:12 +0000 (15:51 +1100)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'
Stephen Rothwell [Mon, 18 Feb 2013 04:49:36 +0000 (15:49 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Mon, 18 Feb 2013 04:42:47 +0000 (15:42 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Conflicts:
drivers/gpio/Kconfig
drivers/pinctrl/pinctrl-nomadik.c
include/linux/mfd/abx500/ab8500.h
Stephen Rothwell [Mon, 18 Feb 2013 04:40:01 +0000 (15:40 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Mon, 18 Feb 2013 04:38:24 +0000 (15:38 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts:
drivers/char/pcmcia/synclink_cs.c
drivers/ipack/devices/ipoctal.c
drivers/mfd/wm5102-tables.c
include/linux/mfd/arizona/pdata.h
Stephen Rothwell [Mon, 18 Feb 2013 04:34:39 +0000 (15:34 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/et131x/et131x.c
Stephen Rothwell [Mon, 18 Feb 2013 04:33:00 +0000 (15:33 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/gadget/Kconfig
drivers/usb/host/ehci-vt8500.c
drivers/usb/musb/omap2430.c
drivers/usb/phy/omap-usb2.c
Stephen Rothwell [Mon, 18 Feb 2013 04:21:08 +0000 (15:21 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/i2c/busses/Kconfig
drivers/lguest/Kconfig
drivers/net/can/Kconfig
drivers/net/wan/Kconfig
Stephen Rothwell [Mon, 18 Feb 2013 04:13:39 +0000 (15:13 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/acpi/Kconfig
drivers/dma/dw_dmac.c
drivers/i2c/busses/i2c-s3c2410.c
drivers/iommu/tegra-smmu.c
drivers/net/ethernet/8390/Kconfig
drivers/net/ethernet/fujitsu/Kconfig
drivers/net/ethernet/i825xx/Kconfig
drivers/net/ethernet/intel/Kconfig
drivers/net/ethernet/racal/Kconfig
drivers/net/ethernet/seeq/Kconfig
drivers/net/wan/Kconfig
drivers/net/wireless/rtlwifi/Kconfig
drivers/spi/Kconfig
drivers/spi/spi-s3c64xx.c
net/wanrouter/Kconfig
Stephen Rothwell [Mon, 18 Feb 2013 04:10:52 +0000 (15:10 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 04:09:15 +0000 (15:09 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 04:07:37 +0000 (15:07 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Conflicts:
drivers/platform/x86/apple-gmux.c
drivers/platform/x86/compal-laptop.c
drivers/platform/x86/fujitsu-tablet.c
drivers/platform/x86/ideapad-laptop.c
drivers/platform/x86/intel_oaktrail.c
drivers/platform/x86/toshiba_acpi.c
Stephen Rothwell [Mon, 18 Feb 2013 04:00:10 +0000 (15:00 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 03:53:39 +0000 (14:53 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Mon, 18 Feb 2013 03:50:56 +0000 (14:50 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Mon, 18 Feb 2013 03:49:17 +0000 (14:49 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/irq.h
arch/s390/kernel/irq.c
arch/x86/include/asm/vmx.h
include/uapi/linux/kvm.h
Stephen Rothwell [Mon, 18 Feb 2013 03:42:50 +0000 (14:42 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 03:35:13 +0000 (14:35 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/powerpc/configs/pasemi_defconfig
arch/s390/Kconfig
kernel/timeconst.pl
Stephen Rothwell [Mon, 18 Feb 2013 03:28:49 +0000 (14:28 +1100)]
Merge remote-tracking branch 'spi/spi/next'
Conflicts:
drivers/spi/spi-s3c64xx.c
Stephen Rothwell [Mon, 18 Feb 2013 03:25:20 +0000 (14:25 +1100)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Mon, 18 Feb 2013 03:23:52 +0000 (14:23 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 03:22:22 +0000 (14:22 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Mon, 18 Feb 2013 03:15:02 +0000 (14:15 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
arch/mips/cavium-octeon/executive/cvmx-helper-util.c
arch/mips/include/asm/octeon/cvmx-helper-util.h
Stephen Rothwell [Mon, 18 Feb 2013 03:13:27 +0000 (14:13 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Mon, 18 Feb 2013 03:11:56 +0000 (14:11 +1100)]
Merge remote-tracking branch 'iommu/next'
Conflicts:
arch/arm/mach-exynos/mach-exynos5-dt.c
Stephen Rothwell [Mon, 18 Feb 2013 03:10:19 +0000 (14:10 +1100)]
Merge remote-tracking branch 'watchdog/master'
Conflicts:
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
Stephen Rothwell [Mon, 18 Feb 2013 03:10:11 +0000 (14:10 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 18 Feb 2013 03:08:41 +0000 (14:08 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
lib/digsig.c
security/integrity/ima/ima_main.c
Stephen Rothwell [Mon, 18 Feb 2013 03:07:10 +0000 (14:07 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 03:05:28 +0000 (14:05 +1100)]
Merge remote-tracking branch 'battery/master'
Conflicts:
drivers/power/ab8500_bmdata.c
include/linux/mfd/abx500/ab8500-bm.h
include/linux/mfd/abx500/ab8500.h
Stephen Rothwell [Mon, 18 Feb 2013 03:03:58 +0000 (14:03 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 03:02:27 +0000 (14:02 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 02:55:21 +0000 (13:55 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 02:55:06 +0000 (13:55 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 18 Feb 2013 02:53:36 +0000 (13:53 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 18 Feb 2013 02:51:54 +0000 (13:51 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Mon, 18 Feb 2013 02:44:29 +0000 (13:44 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 02:37:38 +0000 (13:37 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 02:36:05 +0000 (13:36 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 18 Feb 2013 02:34:37 +0000 (13:34 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 18 Feb 2013 02:27:46 +0000 (13:27 +1100)]
Merge remote-tracking branch 'pekey/devel-pekey'
Stephen Rothwell [Mon, 18 Feb 2013 02:22:13 +0000 (13:22 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Mon, 18 Feb 2013 02:13:56 +0000 (13:13 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 01:53:14 +0000 (12:53 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/radeon/evergreen_cs.c
Stephen Rothwell [Mon, 18 Feb 2013 01:51:37 +0000 (12:51 +1100)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/ctr.c
Stephen Rothwell [Mon, 18 Feb 2013 01:50:03 +0000 (12:50 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 18 Feb 2013 01:47:59 +0000 (12:47 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/ti/wlcore/sdio.c
drivers/net/wireless/ti/wlcore/spi.c
Stephen Rothwell [Mon, 18 Feb 2013 01:42:24 +0000 (12:42 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/mips/include/uapi/asm/socket.h
Stephen Rothwell [Mon, 18 Feb 2013 01:42:16 +0000 (12:42 +1100)]
Merge remote-tracking branch 'dmaengine/next'
Conflicts:
drivers/dma/ioat/dma_v3.c
Stephen Rothwell [Mon, 18 Feb 2013 01:38:17 +0000 (12:38 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/ioat/dma_v3.c
drivers/dma/tegra20-apb-dma.c
Stephen Rothwell [Mon, 18 Feb 2013 01:36:37 +0000 (12:36 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 01:35:02 +0000 (12:35 +1100)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 01:33:32 +0000 (12:33 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 18 Feb 2013 01:31:57 +0000 (12:31 +1100)]
Merge remote-tracking branch 'thermal/next'
Conflicts:
drivers/thermal/exynos_thermal.c
Stephen Rothwell [Mon, 18 Feb 2013 01:24:34 +0000 (12:24 +1100)]
Merge remote-tracking branch 'idle/next'
Conflicts:
arch/x86/kernel/process.c
drivers/acpi/processor_idle.c
Stephen Rothwell [Mon, 18 Feb 2013 01:17:14 +0000 (12:17 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/acpi/internal.h
drivers/acpi/scan.c
drivers/pci/hotplug/acpiphp_glue.c
Stephen Rothwell [Mon, 18 Feb 2013 00:58:43 +0000 (11:58 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:56:48 +0000 (11:56 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 18 Feb 2013 00:52:09 +0000 (11:52 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:50:15 +0000 (11:50 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 18 Feb 2013 00:48:45 +0000 (11:48 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:47:22 +0000 (11:47 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:45:55 +0000 (11:45 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:42:34 +0000 (11:42 +1100)]
Merge remote-tracking branch 'pci/next'
Conflicts:
arch/ia64/pci/pci.c
Stephen Rothwell [Mon, 18 Feb 2013 00:41:05 +0000 (11:41 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Conflicts:
fs/xfs/xfs_buf_item.c
Stephen Rothwell [Mon, 18 Feb 2013 00:39:40 +0000 (11:39 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:37:55 +0000 (11:37 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:36:24 +0000 (11:36 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:34:53 +0000 (11:34 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:33:19 +0000 (11:33 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 18 Feb 2013 00:31:57 +0000 (11:31 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:30:35 +0000 (11:30 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 18 Feb 2013 00:24:04 +0000 (11:24 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:22:42 +0000 (11:22 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Mon, 18 Feb 2013 00:16:12 +0000 (11:16 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 18 Feb 2013 00:14:49 +0000 (11:14 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 18 Feb 2013 00:13:28 +0000 (11:13 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Mon, 18 Feb 2013 00:12:05 +0000 (11:12 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Mon, 18 Feb 2013 00:10:42 +0000 (11:10 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Mon, 18 Feb 2013 00:10:40 +0000 (11:10 +1100)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Mon, 18 Feb 2013 00:09:18 +0000 (11:09 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Mon, 18 Feb 2013 00:07:55 +0000 (11:07 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 18 Feb 2013 00:00:44 +0000 (11:00 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Sun, 17 Feb 2013 23:59:21 +0000 (10:59 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Sun, 17 Feb 2013 23:56:50 +0000 (10:56 +1100)]
Merge remote-tracking branch 'powerpc/next'
projects / karo-tx-linux.git / log