karo-tx-linux.git
5 years agoarm: dts: tx6: remove bootargs from dts
Lothar Waßmann [Fri, 7 Mar 2014 08:05:56 +0000 (09:05 +0100)]
arm: dts: tx6: remove bootargs from dts

5 years agokaro: defconfig: update defconfigs
Lothar Waßmann [Fri, 7 Mar 2014 06:37:11 +0000 (07:37 +0100)]
karo: defconfig: update defconfigs

6 years agoInput: edt-ft5x06 - add DT support KARO-TX6-2013-11-08
Lothar Waßmann [Thu, 24 Oct 2013 06:59:32 +0000 (08:59 +0200)]
Input: edt-ft5x06 - add DT support

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: imx: add defconfigs for TX53
Lothar Waßmann [Wed, 6 Nov 2013 12:14:46 +0000 (13:14 +0100)]
ARM: imx: add defconfigs for TX53

6 years agoARM: imx: add defconfigs for TX6
Lothar Waßmann [Tue, 5 Nov 2013 23:34:14 +0000 (00:34 +0100)]
ARM: imx: add defconfigs for TX6

6 years agofs: jffs2: make jffs2 work zero oobavail
Lothar Waßmann [Tue, 5 Nov 2013 21:54:05 +0000 (22:54 +0100)]
fs: jffs2: make jffs2 work zero oobavail

6 years agomtd: gpmi: disable BB marker swapping
Lothar Waßmann [Tue, 5 Nov 2013 21:52:33 +0000 (22:52 +0100)]
mtd: gpmi: disable BB marker swapping

6 years agoARM: dts: tx28: add power-supply property for backlight
Lothar Waßmann [Tue, 5 Nov 2013 21:51:37 +0000 (22:51 +0100)]
ARM: dts: tx28: add power-supply property for backlight

6 years agoInput: tsc2007: Add device tree support.
Denis Carikli [Tue, 5 Nov 2013 13:37:06 +0000 (14:37 +0100)]
Input: tsc2007: Add device tree support.

Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Lothar Waßmann <LW@KARO-electronics.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
6 years agoARM: dts: tx28: update properties for tsc2007
Lothar Waßmann [Tue, 5 Nov 2013 21:48:48 +0000 (22:48 +0100)]
ARM: dts: tx28: update properties for tsc2007

6 years agoARM: dts: karo: provide inverted PWM signal by reversing brightness-levels
Lothar Waßmann [Tue, 5 Nov 2013 15:34:56 +0000 (16:34 +0100)]
ARM: dts: karo: provide inverted PWM signal by reversing brightness-levels

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agopwm-backlight: use duty_cycle rather than brightness value to decide whether to shutd...
Lothar Waßmann [Tue, 5 Nov 2013 15:30:14 +0000 (16:30 +0100)]
pwm-backlight: use duty_cycle rather than brightness value to decide whether to shutdown PWM

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agopwm: print error messages using pr_err() rather than pr_debug()
Lothar Waßmann [Tue, 5 Nov 2013 15:28:51 +0000 (16:28 +0100)]
pwm: print error messages using pr_err() rather than pr_debug()

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx6: add uart2 rtscts pins
Lothar Waßmann [Tue, 5 Nov 2013 09:54:22 +0000 (10:54 +0100)]
ARM: dts: imx6: add uart2 rtscts pins

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: imx6q: add missing sentinel to divider table
Lothar Waßmann [Thu, 31 Oct 2013 11:48:15 +0000 (12:48 +0100)]
ARM: imx6q: add missing sentinel to divider table

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx53: Add support for Ka-Ro electronics TX53 modules
Lothar Waßmann [Tue, 29 Oct 2013 07:46:59 +0000 (08:46 +0100)]
ARM: dts: imx53: Add support for Ka-Ro electronics TX53 modules

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx53: Add another pwm pinctrl
Lothar Waßmann [Tue, 29 Oct 2013 07:45:04 +0000 (08:45 +0100)]
ARM: dts: imx53: Add another pwm pinctrl

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx53: Add sata support
Lothar Waßmann [Tue, 29 Oct 2013 07:44:35 +0000 (08:44 +0100)]
ARM: dts: imx53: Add sata support

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoahci_platform: enable DT probing
Lothar Waßmann [Thu, 24 Oct 2013 08:23:18 +0000 (10:23 +0200)]
ahci_platform: enable DT probing

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoahci_platform: fix error return values in ahci_probe() function
Lothar Waßmann [Thu, 24 Oct 2013 07:57:09 +0000 (09:57 +0200)]
ahci_platform: fix error return values in ahci_probe() function

- ENODEV is more appropriate than EINVAL if platform_get_resource() fails
- promote the return value from platform_get_irq() rather than inventing
  a new one

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: tx28: use defined constants for GPIO polarity
Lothar Waßmann [Thu, 24 Oct 2013 07:44:05 +0000 (09:44 +0200)]
ARM: dts: tx28: use defined constants for GPIO polarity

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx6qdl: add support for Ka-Ro TX6 modules
Lothar Waßmann [Thu, 24 Oct 2013 07:38:02 +0000 (09:38 +0200)]
ARM: dts: imx6qdl: add support for Ka-Ro TX6 modules

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx6qdl: add more pinctrls for usbh1
Lothar Waßmann [Thu, 24 Oct 2013 07:36:11 +0000 (09:36 +0200)]
ARM: dts: imx6qdl: add more pinctrls for usbh1

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx6qdl: add more pinctrls for pwm
Lothar Waßmann [Thu, 24 Oct 2013 07:35:52 +0000 (09:35 +0200)]
ARM: dts: imx6qdl: add more pinctrls for pwm

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx6qdl: rename pinctrl_pwm0 for consistency
Lothar Waßmann [Thu, 24 Oct 2013 07:35:28 +0000 (09:35 +0200)]
ARM: dts: imx6qdl: rename pinctrl_pwm0 for consistency

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx6qdl: add more pinctrls for flexcan
Lothar Waßmann [Thu, 24 Oct 2013 07:32:06 +0000 (09:32 +0200)]
ARM: dts: imx6qdl: add more pinctrls for flexcan

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx6qdl: add more pinctrls for enet
Lothar Waßmann [Thu, 24 Oct 2013 07:31:12 +0000 (09:31 +0200)]
ARM: dts: imx6qdl: add more pinctrls for enet

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx6qdl: add more pinctrls for audmux
Lothar Waßmann [Thu, 24 Oct 2013 07:29:33 +0000 (09:29 +0200)]
ARM: dts: imx6qdl: add more pinctrls for audmux

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agoARM: dts: imx6qdl: add pinctrl for uart3 RTC/CTS
Lothar Waßmann [Thu, 24 Oct 2013 07:21:37 +0000 (09:21 +0200)]
ARM: dts: imx6qdl: add pinctrl for uart3 RTC/CTS

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
6 years agosysfs: fix sysfs_write_file for bin file
Ming Lei [Wed, 23 Oct 2013 13:44:53 +0000 (21:44 +0800)]
sysfs: fix sysfs_write_file for bin file

Before patch(sysfs: prepare path write for unified regular / bin
file handling), when size of bin file is zero, writting still can
continue, but this patch changes the behaviour.

The worse thing is that firmware loader is broken by this patch,
and user space application can't write to firmware bin file any more
because both firmware loader and drivers can't know at advance how
large the firmware file is and have to set its initialized size as
zero.

This patch fixes the problem and keeps behaviour of writting to bin
as before.

Reported-by: Lothar Waßmann <LW@karo-electronics.de>
Tested-by: Lothar Waßmann <LW@karo-electronics.de>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
6 years agodrm/imx: convert dev_dbg() to dev_err() for error message
Lothar Waßmann [Tue, 22 Oct 2013 11:49:21 +0000 (13:49 +0200)]
drm/imx: convert dev_dbg() to dev_err() for error message

6 years agoimx-drm: use native mode if available rather than first in list
Lothar Waßmann [Mon, 21 Oct 2013 14:43:24 +0000 (16:43 +0200)]
imx-drm: use native mode if available rather than first in list

6 years agonet: fec: call dma_mapping_error() where appropriate
Lothar Waßmann [Mon, 21 Oct 2013 14:36:23 +0000 (16:36 +0200)]
net: fec: call dma_mapping_error() where appropriate

This patch fixes the warning:
| DMA-API: device driver failed to check map error
when compiled with CONFIG_DMA_API_DEBUG enabled.

6 years agonet: fec: fix phy-reset-duration limiting
Lothar Waßmann [Mon, 21 Oct 2013 14:31:30 +0000 (16:31 +0200)]
net: fec: fix phy-reset-duration limiting

one second are 1000 milliseconds, not just '1'

6 years agoAdd linux-next specific files for 20131024 next-20131024
Thierry Reding [Thu, 24 Oct 2013 16:26:43 +0000 (18:26 +0200)]
Add linux-next specific files for 20131024

Signed-off-by: Thierry Reding <treding@nvidia.com>
6 years agoARM: nommu: Implement dummy early_paging_init()
Thierry Reding [Mon, 21 Oct 2013 15:26:20 +0000 (17:26 +0200)]
ARM: nommu: Implement dummy early_paging_init()

No-MMU configurations currenty fail to build because they are missing
the early_paging_init() symbol.

Signed-off-by: Thierry Reding <treding@nvidia.com>
6 years agoARM: Use arch_virt_to_idmap() only when available
Thierry Reding [Mon, 21 Oct 2013 15:25:43 +0000 (17:25 +0200)]
ARM: Use arch_virt_to_idmap() only when available

The arch_virt_to_idmap variable is only available when patching of the
physical to virtual translations at runtime is enabled via the Kconfig
ARM_PATCH_PHYS_VIRT option.

Signed-off-by: Thierry Reding <treding@nvidia.com>
6 years agommc: sdhci: dove: Fix build breakage
Thierry Reding [Tue, 22 Oct 2013 14:53:18 +0000 (16:53 +0200)]
mmc: sdhci: dove: Fix build breakage

Commit 2d7c51f (mmc: sdhci: Use work structs instead of tasklets)
converts tasklets to work structs, but typos the conversion in the Dove
driver.

Signed-off-by: Thierry Reding <treding@nvidia.com>
6 years agoARM: davinci: Avoid name collisions
Thierry Reding [Mon, 21 Oct 2013 15:25:16 +0000 (17:25 +0200)]
ARM: davinci: Avoid name collisions

Signed-off-by: Thierry Reding <treding@nvidia.com>
6 years agotracing/events: Fix swiotlb tracepoint creation
Thierry Reding [Wed, 23 Oct 2013 11:21:52 +0000 (13:21 +0200)]
tracing/events: Fix swiotlb tracepoint creation

Tracepoints are only created when Xen support is enabled, but they are
also referenced within lib/swiotlb.c. So unless Xen support is enabled
the tracepoints will be missing, therefore causing builds to fail. Fix
this by moving the tracepoint creation to lib/swiotlb.c, which works
nicely because the Xen swiotlb support selects the generic swiotlb
support.

Signed-off-by: Thierry Reding <treding@nvidia.com>
6 years agogpio: Fix build breakage
Thierry Reding [Mon, 21 Oct 2013 15:26:48 +0000 (17:26 +0200)]
gpio: Fix build breakage

Signed-off-by: Thierry Reding <treding@nvidia.com>
6 years agoPowerCap: Convert class code to use dev_groups
Thierry Reding [Tue, 22 Oct 2013 14:55:38 +0000 (16:55 +0200)]
PowerCap: Convert class code to use dev_groups

The newly added power capping framework uses the obsolete .dev_attrs
field of struct class. However this field will be removed in 3.13, so
convert the code to use the .dev_groups field instead.

Signed-off-by: Thierry Reding <treding@nvidia.com>
6 years agosched/wait: Fix build breakage
Thierry Reding [Tue, 22 Oct 2013 15:00:00 +0000 (17:00 +0200)]
sched/wait: Fix build breakage

The wait_event_interruptible_lock_irq() macro is missing a semi-colon
which causes a build failure in the i915 DRM driver.

Signed-off-by: Thierry Reding <treding@nvidia.com>
6 years agomisc: mic: Update for sysfs_get_dirent() cleanups
Mark Brown [Thu, 3 Oct 2013 23:53:01 +0000 (00:53 +0100)]
misc: mic: Update for sysfs_get_dirent() cleanups

Signed-off-by: Mark Brown <broonie@linaro.org>
6 years agodrm/i915: Resolve interaction with drm-fixes tree
Mark Brown [Thu, 3 Oct 2013 17:10:55 +0000 (18:10 +0100)]
drm/i915: Resolve interaction with drm-fixes tree

Signed-off-by: Mark Brown <broonie@linaro.org>
6 years agoceph: Fix up for iov_iter changes
Mark Brown [Thu, 3 Oct 2013 12:05:20 +0000 (13:05 +0100)]
ceph: Fix up for iov_iter changes

Extend an earlier fixup by Stephen Rothwell.

Signed-off-by: Mark Brown <broonie@linaro.org>
6 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Thierry Reding [Thu, 24 Oct 2013 13:02:50 +0000 (15:02 +0200)]
Merge remote-tracking branch 'lzo-update/lzo-update'

6 years agoMerge remote-tracking branch 'random/dev'
Thierry Reding [Thu, 24 Oct 2013 13:02:45 +0000 (15:02 +0200)]
Merge remote-tracking branch 'random/dev'

Conflicts:
drivers/char/random.c

6 years agoMerge remote-tracking branch 'clk/clk-next'
Thierry Reding [Thu, 24 Oct 2013 13:02:40 +0000 (15:02 +0200)]
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
drivers/clk/Makefile

6 years agoMerge remote-tracking branch 'userns/for-next'
Thierry Reding [Thu, 24 Oct 2013 13:02:30 +0000 (15:02 +0200)]
Merge remote-tracking branch 'userns/for-next'

Conflicts:
fs/fuse/dir.c

6 years agoMerge remote-tracking branch 'pwm/for-next'
Thierry Reding [Thu, 24 Oct 2013 13:02:23 +0000 (15:02 +0200)]
Merge remote-tracking branch 'pwm/for-next'

Conflicts:
arch/arm/mach-omap2/board-zoom-peripherals.c

6 years agoMerge remote-tracking branch 'tegra/for-next'
Thierry Reding [Thu, 24 Oct 2013 13:02:07 +0000 (15:02 +0200)]
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
MAINTAINERS

6 years agoMerge remote-tracking branch 'samsung/for-next'
Thierry Reding [Thu, 24 Oct 2013 13:02:00 +0000 (15:02 +0200)]
Merge remote-tracking branch 'samsung/for-next'

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

6 years agoMerge remote-tracking branch 'renesas/next'
Thierry Reding [Thu, 24 Oct 2013 13:01:49 +0000 (15:01 +0200)]
Merge remote-tracking branch 'renesas/next'

6 years agoMerge remote-tracking branch 'mvebu/for-next'
Thierry Reding [Thu, 24 Oct 2013 13:01:46 +0000 (15:01 +0200)]
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/mach-kirkwood/board-dt.c

6 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Thierry Reding [Thu, 24 Oct 2013 13:00:55 +0000 (15:00 +0200)]
Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/mach-imx/mach-imx6q.c

6 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Thierry Reding [Thu, 24 Oct 2013 13:00:07 +0000 (15:00 +0200)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

6 years agoMerge remote-tracking branch 'arm-soc/for-next'
Thierry Reding [Thu, 24 Oct 2013 13:00:02 +0000 (15:00 +0200)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
MAINTAINERS
arch/arm/boot/dts/omap3-evm.dts
arch/arm/mach-tegra/Kconfig
arch/arm/mach-ux500/board-mop500.c

6 years agoMerge remote-tracking branch 'gpio/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:59:44 +0000 (14:59 +0200)]
Merge remote-tracking branch 'gpio/for-next'

6 years agoMerge remote-tracking branch 'pinctrl/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:59:39 +0000 (14:59 +0200)]
Merge remote-tracking branch 'pinctrl/for-next'

6 years agoMerge remote-tracking branch 'target-updates/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:59:34 +0000 (14:59 +0200)]
Merge remote-tracking branch 'target-updates/for-next'

6 years agoMerge remote-tracking branch 'scsi/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:59:32 +0000 (14:59 +0200)]
Merge remote-tracking branch 'scsi/for-next'

6 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Thierry Reding [Thu, 24 Oct 2013 12:59:31 +0000 (14:59 +0200)]
Merge remote-tracking branch 'char-misc/char-misc-next'

6 years agoMerge remote-tracking branch 'staging/staging-next'
Thierry Reding [Thu, 24 Oct 2013 12:59:28 +0000 (14:59 +0200)]
Merge remote-tracking branch 'staging/staging-next'

6 years agoMerge remote-tracking branch 'usb-gadget/next'
Thierry Reding [Thu, 24 Oct 2013 12:59:25 +0000 (14:59 +0200)]
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/musb/davinci.c

6 years agoMerge remote-tracking branch 'usb/usb-next'
Thierry Reding [Thu, 24 Oct 2013 12:59:20 +0000 (14:59 +0200)]
Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/Kconfig

6 years agoMerge remote-tracking branch 'tty/tty-next'
Thierry Reding [Thu, 24 Oct 2013 12:59:14 +0000 (14:59 +0200)]
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/imx.c

6 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Thierry Reding [Thu, 24 Oct 2013 12:59:08 +0000 (14:59 +0200)]
Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
include/linux/netdevice.h

6 years agoMerge remote-tracking branch 'leds/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:59:04 +0000 (14:59 +0200)]
Merge remote-tracking branch 'leds/for-next'

6 years agoMerge remote-tracking branch 'regmap/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:58:58 +0000 (14:58 +0200)]
Merge remote-tracking branch 'regmap/for-next'

6 years agoMerge remote-tracking branch 'workqueues/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:58:53 +0000 (14:58 +0200)]
Merge remote-tracking branch 'workqueues/for-next'

6 years agoMerge remote-tracking branch 'percpu/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:58:51 +0000 (14:58 +0200)]
Merge remote-tracking branch 'percpu/for-next'

6 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Thierry Reding [Thu, 24 Oct 2013 12:58:49 +0000 (14:58 +0200)]
Merge remote-tracking branch 'xen-tip/linux-next'

6 years agoMerge remote-tracking branch 'kvm-arm/kvm-arm-next'
Thierry Reding [Thu, 24 Oct 2013 12:58:43 +0000 (14:58 +0200)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'

Conflicts:
arch/arm/kvm/reset.c

6 years agoMerge remote-tracking branch 'kvm/linux-next'
Thierry Reding [Thu, 24 Oct 2013 12:58:35 +0000 (14:58 +0200)]
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/arm/kvm/reset.c

6 years agoMerge remote-tracking branch 'ftrace/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:58:17 +0000 (14:58 +0200)]
Merge remote-tracking branch 'ftrace/for-next'

6 years agoMerge remote-tracking branch 'edac-amd/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:58:15 +0000 (14:58 +0200)]
Merge remote-tracking branch 'edac-amd/for-next'

6 years agoMerge remote-tracking branch 'tip/auto-latest'
Thierry Reding [Thu, 24 Oct 2013 12:39:48 +0000 (14:39 +0200)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak

6 years agoMerge remote-tracking branch 'spi/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:37:27 +0000 (14:37 +0200)]
Merge remote-tracking branch 'spi/for-next'

Conflicts:
drivers/spi/spi.c

6 years agoMerge remote-tracking branch 'dt-rh/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:37:24 +0000 (14:37 +0200)]
Merge remote-tracking branch 'dt-rh/for-next'

6 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
Thierry Reding [Thu, 24 Oct 2013 12:37:22 +0000 (14:37 +0200)]
Merge remote-tracking branch 'devicetree/devicetree/next'

6 years agoMerge remote-tracking branch 'trivial/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:37:14 +0000 (14:37 +0200)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
net/netfilter/xt_set.c

6 years agoMerge remote-tracking branch 'iommu/next'
Thierry Reding [Thu, 24 Oct 2013 12:37:05 +0000 (14:37 +0200)]
Merge remote-tracking branch 'iommu/next'

6 years agoMerge remote-tracking branch 'security/next'
Thierry Reding [Thu, 24 Oct 2013 12:36:59 +0000 (14:36 +0200)]
Merge remote-tracking branch 'security/next'

6 years agoMerge remote-tracking branch 'regulator/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:58 +0000 (14:36 +0200)]
Merge remote-tracking branch 'regulator/for-next'

6 years agoMerge remote-tracking branch 'fbdev/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:54 +0000 (14:36 +0200)]
Merge remote-tracking branch 'fbdev/for-next'

6 years agoMerge remote-tracking branch 'battery/master'
Thierry Reding [Thu, 24 Oct 2013 12:36:52 +0000 (14:36 +0200)]
Merge remote-tracking branch 'battery/master'

6 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:49 +0000 (14:36 +0200)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

Conflicts:
sound/soc/codecs/mc13783.c

6 years agoMerge remote-tracking branch 'mfd/master'
Thierry Reding [Thu, 24 Oct 2013 12:36:41 +0000 (14:36 +0200)]
Merge remote-tracking branch 'mfd/master'

6 years agoMerge remote-tracking branch 'md/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:40 +0000 (14:36 +0200)]
Merge remote-tracking branch 'md/for-next'

6 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:37 +0000 (14:36 +0200)]
Merge remote-tracking branch 'kgdb/kgdb-next'

6 years agoMerge remote-tracking branch 'mmc/mmc-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:35 +0000 (14:36 +0200)]
Merge remote-tracking branch 'mmc/mmc-next'

6 years agoMerge remote-tracking branch 'block/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:26 +0000 (14:36 +0200)]
Merge remote-tracking branch 'block/for-next'

6 years agoMerge remote-tracking branch 'cgroup/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:22 +0000 (14:36 +0200)]
Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
mm/memcontrol.c

6 years agoMerge remote-tracking branch 'input/next'
Thierry Reding [Thu, 24 Oct 2013 12:36:17 +0000 (14:36 +0200)]
Merge remote-tracking branch 'input/next'

6 years agoMerge remote-tracking branch 'virtio/virtio-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:16 +0000 (14:36 +0200)]
Merge remote-tracking branch 'virtio/virtio-next'

6 years agoMerge remote-tracking branch 'modules/modules-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:14 +0000 (14:36 +0200)]
Merge remote-tracking branch 'modules/modules-next'

6 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:06 +0000 (14:36 +0200)]
Merge remote-tracking branch 'sound-asoc/for-next'

6 years agoMerge remote-tracking branch 'sound/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:04 +0000 (14:36 +0200)]
Merge remote-tracking branch 'sound/for-next'

6 years agoMerge remote-tracking branch 'drm-tegra/drm/for-next'
Thierry Reding [Thu, 24 Oct 2013 12:36:01 +0000 (14:36 +0200)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'

Conflicts:
drivers/gpu/drm/tegra/Kconfig