]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agocompiler-gcc4.h: Reorder macros based upon gcc ver
Daniel Santos [Wed, 20 Feb 2013 02:13:28 +0000 (13:13 +1100)]
compiler-gcc4.h: Reorder macros based upon gcc ver

This helps to keep the file from getting confusing, removes one duplicate
version check and should encourage future editors to put new macros where
they belong.

Signed-off-by: Daniel Santos <daniel.santos@pobox.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Borislav Petkov <bp@alien8.de>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Joe Perches <joe@perches.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Wed, 20 Feb 2013 05:51:32 +0000 (16:51 +1100)]
Merge branch 'akpm-current/current'

11 years agoMerge remote-tracking branch 'modem_shm/remoteproc-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:41:16 +0000 (16:41 +1100)]
Merge remote-tracking branch 'modem_shm/remoteproc-next'

11 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Wed, 20 Feb 2013 05:39:28 +0000 (16:39 +1100)]
Merge remote-tracking branch 'lzo-update/lzo-update'

11 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:37:50 +0000 (16:37 +1100)]
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
include/asm-generic/vmlinux.lds.h

11 years agoMerge remote-tracking branch 'signal/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:30:49 +0000 (16:30 +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

11 years agoMerge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:29:16 +0000 (16:29 +1100)]
Merge remote-tracking branch 'ktest/for-next'

11 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:27:27 +0000 (16:27 +1100)]
Merge remote-tracking branch 'userns/for-next'

Conflicts:
net/sunrpc/svcauth_unix.c

11 years agoMerge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:25:53 +0000 (16:25 +1100)]
Merge remote-tracking branch 'dma-buf/for-next'

11 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:24:24 +0000 (16:24 +1100)]
Merge remote-tracking branch 'pwm/for-next'

11 years agoMerge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:22:54 +0000 (16:22 +1100)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'

11 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:22:51 +0000 (16:22 +1100)]
Merge remote-tracking branch 'tegra/for-next'

11 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:21:16 +0000 (16:21 +1100)]
Merge remote-tracking branch 'samsung/for-next'

11 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 20 Feb 2013 05:19:39 +0000 (16:19 +1100)]
Merge remote-tracking branch 'renesas/next'

11 years agoMerge remote-tracking branch 'ixp4xx/next'
Stephen Rothwell [Wed, 20 Feb 2013 05:19:30 +0000 (16:19 +1100)]
Merge remote-tracking branch 'ixp4xx/next'

11 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:19:27 +0000 (16:19 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

11 years agoMerge remote-tracking branch 'cortex/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:17:55 +0000 (16:17 +1100)]
Merge remote-tracking branch 'cortex/for-next'

Conflicts:
arch/arm/include/asm/cputype.h

11 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:10:13 +0000 (16:10 +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/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/core/sdio.c
drivers/mmc/host/sdhci-bcm2835.c
drivers/mmc/host/sdhci-esdhc-imx.c
drivers/mmc/host/sdhci-pxav3.c
drivers/mmc/host/sh_mmcif.c
drivers/pinctrl/pinctrl-nomadik.c
include/linux/mmc/host.h

11 years agoMerge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:05:41 +0000 (16:05 +1100)]
Merge remote-tracking branch 'gpio-lw/for-next'

11 years agoMerge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Wed, 20 Feb 2013 05:04:00 +0000 (16:04 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'

11 years agoMerge remote-tracking branch 'irqdomain/irqdomain/next'
Stephen Rothwell [Wed, 20 Feb 2013 05:02:31 +0000 (16:02 +1100)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'

11 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Wed, 20 Feb 2013 05:00:51 +0000 (16:00 +1100)]
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/vhost/Makefile

11 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:47:49 +0000 (15:47 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
drivers/gpio/Kconfig
drivers/pinctrl/pinctrl-nomadik.c
include/linux/mfd/abx500/ab8500.h

11 years agoMerge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:45:03 +0000 (15:45 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'

11 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:43:27 +0000 (15:43 +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

11 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:39:42 +0000 (15:39 +1100)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/et131x/et131x.c

11 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:38:04 +0000 (15:38 +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

11 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:32:35 +0000 (15:32 +1100)]
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/i2c/busses/Kconfig
drivers/lguest/Kconfig
drivers/net/can/Kconfig
drivers/net/wan/Kconfig

11 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:25:06 +0000 (15:25 +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
drivers/vhost/Kconfig
drivers/vhost/Kconfig.tcm
net/wanrouter/Kconfig

11 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:19:29 +0000 (15:19 +1100)]
Merge remote-tracking branch 'leds/for-next'

11 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:17:53 +0000 (15:17 +1100)]
Merge remote-tracking branch 'regmap/for-next'

11 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:16:16 +0000 (15:16 +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

11 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:08:52 +0000 (15:08 +1100)]
Merge remote-tracking branch 'workqueues/for-next'

11 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 20 Feb 2013 04:02:20 +0000 (15:02 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'

11 years agoMerge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:59:34 +0000 (14:59 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

11 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:57:55 +0000 (14:57 +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

11 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:51:29 +0000 (14:51 +1100)]
Merge remote-tracking branch 'ftrace/for-next'

11 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 20 Feb 2013 03:43:53 +0000 (14:43 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/powerpc/configs/pasemi_defconfig
arch/s390/Kconfig
kernel/timeconst.pl

11 years agoMerge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Wed, 20 Feb 2013 03:41:07 +0000 (14:41 +1100)]
Merge remote-tracking branch 'spi/spi/next'

Conflicts:
drivers/spi/spi-s3c64xx.c

11 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Wed, 20 Feb 2013 03:38:17 +0000 (14:38 +1100)]
Merge remote-tracking branch 'devicetree/devicetree/next'

11 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:36:48 +0000 (14:36 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

11 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 20 Feb 2013 03:35:18 +0000 (14:35 +1100)]
Merge remote-tracking branch 'edac/linux_next'

11 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:28:05 +0000 (14:28 +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

11 years agoMerge remote-tracking branch 'vfio/next'
Stephen Rothwell [Wed, 20 Feb 2013 03:26:28 +0000 (14:26 +1100)]
Merge remote-tracking branch 'vfio/next'

11 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 20 Feb 2013 03:24:57 +0000 (14:24 +1100)]
Merge remote-tracking branch 'iommu/next'

Conflicts:
arch/arm/mach-exynos/mach-exynos5-dt.c

11 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 20 Feb 2013 03:23:20 +0000 (14:23 +1100)]
Merge remote-tracking branch 'watchdog/master'

Conflicts:
drivers/watchdog/Kconfig
drivers/watchdog/Makefile

11 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 20 Feb 2013 03:23:11 +0000 (14:23 +1100)]
Merge remote-tracking branch 'selinux/master'

11 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Wed, 20 Feb 2013 03:21:40 +0000 (14:21 +1100)]
Merge remote-tracking branch 'security/next'

Conflicts:
lib/digsig.c
security/integrity/ima/ima_main.c

11 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:20:09 +0000 (14:20 +1100)]
Merge remote-tracking branch 'regulator/for-next'

11 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 20 Feb 2013 03:18:27 +0000 (14:18 +1100)]
Merge remote-tracking branch 'battery/master'

Conflicts:
include/linux/mfd/abx500/ab8500.h

11 years agoMerge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:16:55 +0000 (14:16 +1100)]
Merge remote-tracking branch 'mfd/for-next'

11 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:15:25 +0000 (14:15 +1100)]
Merge remote-tracking branch 'md/for-next'

11 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:08:20 +0000 (14:08 +1100)]
Merge remote-tracking branch 'slab/for-next'

11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:08:04 +0000 (14:08 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 20 Feb 2013 03:06:33 +0000 (14:06 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

11 years agoMerge branch 'device-mapper/master'
Stephen Rothwell [Wed, 20 Feb 2013 03:04:50 +0000 (14:04 +1100)]
Merge branch 'device-mapper/master'

11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:56:43 +0000 (13:56 +1100)]
Merge remote-tracking branch 'block/for-next'

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:48:55 +0000 (13:48 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 20 Feb 2013 02:47:22 +0000 (13:47 +1100)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:45:53 +0000 (13:45 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

11 years agoMerge remote-tracking branch 'pekey/devel-pekey'
Stephen Rothwell [Wed, 20 Feb 2013 02:38:59 +0000 (13:38 +1100)]
Merge remote-tracking branch 'pekey/devel-pekey'

11 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:33:39 +0000 (13:33 +1100)]
Merge remote-tracking branch 'modules/modules-next'

11 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:31:40 +0000 (13:31 +1100)]
Merge remote-tracking branch 'sound/for-next'

11 years agoMerge remote-tracking branch 'drm-intel/drm-intel-next-queued'
Stephen Rothwell [Wed, 20 Feb 2013 02:24:25 +0000 (13:24 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'

11 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:22:26 +0000 (13:22 +1100)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/radeon/evergreen_cs.c

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 20 Feb 2013 02:20:50 +0000 (13:20 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 20 Feb 2013 02:19:11 +0000 (13:19 +1100)]
Merge remote-tracking branch 'wireless-next/master'

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 20 Feb 2013 02:13:21 +0000 (13:13 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/mips/include/uapi/asm/socket.h
crypto/ctr.c

11 years agodevice_cgroup: don't grab mutex in rcu callback
Jerry Snitselaar [Wed, 20 Feb 2013 02:13:20 +0000 (13:13 +1100)]
device_cgroup: don't grab mutex in rcu callback

commit 103a197 ("security/device_cgroup: lock assert fails in
dev_exception_clean()") grabs devcgroup_mutex to fix assert failure, but
mutex can't be grabbed in rcu callback.  Since there shouldn't be any
other references when css_free is called, mutex isn't needed for list
cleanup in devcgroup_css_free().

Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Aristeu Rozanski <aris@redhat.com>
Cc: James Morris <james.l.morris@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Wed, 20 Feb 2013 02:13:12 +0000 (13:13 +1100)]
Merge remote-tracking branch 'dmaengine/next'

Conflicts:
drivers/dma/ioat/dma_v3.c

11 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 20 Feb 2013 02:09:13 +0000 (13:09 +1100)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/ioat/dma_v3.c
drivers/dma/tegra20-apb-dma.c

11 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:07:33 +0000 (13:07 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

11 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 02:05:58 +0000 (13:05 +1100)]
Merge remote-tracking branch 'scsi/for-next'

11 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 20 Feb 2013 02:04:28 +0000 (13:04 +1100)]
Merge remote-tracking branch 'dlm/next'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Wed, 20 Feb 2013 02:02:52 +0000 (13:02 +1100)]
Merge remote-tracking branch 'thermal/next'

Conflicts:
drivers/thermal/exynos_thermal.c

11 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:55:18 +0000 (12:55 +1100)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
drivers/acpi/internal.h
drivers/acpi/scan.c
drivers/pci/hotplug/acpiphp_glue.c
drivers/pci/pci-acpi.c

11 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:29:59 +0000 (12:29 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

11 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 20 Feb 2013 01:28:04 +0000 (12:28 +1100)]
Merge remote-tracking branch 'libata/NEXT'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:22:21 +0000 (12:22 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 20 Feb 2013 01:20:26 +0000 (12:20 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:18:56 +0000 (12:18 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:17:33 +0000 (12:17 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:16:06 +0000 (12:16 +1100)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 20 Feb 2013 01:12:45 +0000 (12:12 +1100)]
Merge remote-tracking branch 'pci/next'

Conflicts:
arch/ia64/pci/pci.c

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:11:15 +0000 (12:11 +1100)]
Merge remote-tracking branch 'xfs/for-next'

Conflicts:
fs/xfs/xfs_buf_item.c

11 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:09:51 +0000 (12:09 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:08:06 +0000 (12:08 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:06:33 +0000 (12:06 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:04:12 +0000 (12:04 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 20 Feb 2013 01:02:38 +0000 (12:02 +1100)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 20 Feb 2013 01:01:15 +0000 (12:01 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 20 Feb 2013 00:58:58 +0000 (11:58 +1100)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 00:52:25 +0000 (11:52 +1100)]
Merge remote-tracking branch 'fuse/for-next'

11 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 20 Feb 2013 00:51:03 +0000 (11:51 +1100)]
Merge remote-tracking branch 'f2fs/dev'

11 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 20 Feb 2013 00:43:43 +0000 (11:43 +1100)]
Merge remote-tracking branch 'ext4/dev'

11 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 20 Feb 2013 00:42:20 +0000 (11:42 +1100)]
Merge remote-tracking branch 'ext3/for_next'

11 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 20 Feb 2013 00:40:59 +0000 (11:40 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 20 Feb 2013 00:39:35 +0000 (11:39 +1100)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Wed, 20 Feb 2013 00:38:12 +0000 (11:38 +1100)]
Merge remote-tracking branch 'ceph/master'

11 years agoMerge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Wed, 20 Feb 2013 00:38:10 +0000 (11:38 +1100)]
Merge remote-tracking branch 'btrfs/next'