* [GIT PULL 2/5] omap pm clean-up for v3.10 merge window
[not found] <pull-1365483063-475562>
@ 2013-04-09 4:51 ` Tony Lindgren
2013-04-09 4:51 ` [GIT PULL 3/5] omap board changes " Tony Lindgren
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-04-09 4:51 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:
Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed
for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc:
Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700)
----------------------------------------------------------------
PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>:
OMAP3/4 CPUidle cleanups for v3.10
----------------------------------------------------------------
Daniel Lezcano (1):
ARM: omap3: cpuidle: enable time keeping
Santosh Shilimkar (5):
ARM: OMAP4: CPUidle: Avoid double idle driver registration
ARM: OMAP: CPUidle: Unregister drivere on device registration failure
ARM: OMAP4: CPUidle: Make C-state description field more precise
ARM: OMAP4+: CPUidle: Deprecate use of omap4_mpuss_read_prev_context_state()
ARM: OMAP4+: CPUidle: Consolidate idle driver for OMAP5 support
Tony Lindgren (1):
Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.10/cleanup-pm
arch/arm/mach-omap2/common.h | 5 ----
arch/arm/mach-omap2/cpuidle34xx.c | 11 +++++--
arch/arm/mach-omap2/cpuidle44xx.c | 48 +++++++++++++++++--------------
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 14 ---------
4 files changed, 35 insertions(+), 43 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [GIT PULL 3/5] omap board changes for v3.10 merge window
[not found] <pull-1365483063-475562>
2013-04-09 4:51 ` [GIT PULL 2/5] omap pm clean-up for v3.10 merge window Tony Lindgren
@ 2013-04-09 4:51 ` Tony Lindgren
2013-04-09 4:51 ` [GIT PULL 4/5] omap soc " Tony Lindgren
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-04-09 4:51 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 31880c37c11e28cb81c70757e38392b42e695dc6:
Linux 3.9-rc6 (2013-04-07 20:49:54 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/board-signed
for you to fetch changes up to 06993d6a8a51b90fc78c8c3cb7a81c9b4b88c683:
ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight (2013-04-08 14:01:05 -0700)
----------------------------------------------------------------
Board related changes for v3.10 merge window. These are pretty
much all non-critical fixes for platform device initialization
that will be needed until we can drop the board-*.c files and
move to DT based boot.
----------------------------------------------------------------
Aaro Koskinen (2):
ARM: OMAP1: fix omap_udc registration
ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d
Andrew Chew (1):
ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight
Paul Bolle (2):
omap2+: Remove useless Makefile line
omap2+: Remove useless Makefile line
Peter Ujfalusi (1):
ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
Ruslan Bilovol (1):
ARM: OMAP2+: omap2plus_defconfig: Add support for BMP085 pressure sensor
arch/arm/configs/omap2plus_defconfig | 1 +
arch/arm/mach-omap1/include/mach/usb.h | 2 +-
arch/arm/mach-omap1/usb.c | 6 +--
arch/arm/mach-omap2/Makefile | 3 --
arch/arm/mach-omap2/board-4430sdp.c | 6 +++
arch/arm/mach-omap2/board-rx51-peripherals.c | 4 ++
arch/arm/mach-omap2/board-zoom-display.c | 56 ----------------------------
arch/arm/mach-omap2/board-zoom-peripherals.c | 53 +++++++++++++++++++++++++-
8 files changed, 67 insertions(+), 64 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [GIT PULL 4/5] omap soc changes for v3.10 merge window
[not found] <pull-1365483063-475562>
2013-04-09 4:51 ` [GIT PULL 2/5] omap pm clean-up for v3.10 merge window Tony Lindgren
2013-04-09 4:51 ` [GIT PULL 3/5] omap board changes " Tony Lindgren
@ 2013-04-09 4:51 ` Tony Lindgren
2013-04-09 4:51 ` [GIT PULL 5/5] omap dt " Tony Lindgren
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-04-09 4:51 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 31880c37c11e28cb81c70757e38392b42e695dc6:
Linux 3.9-rc6 (2013-04-07 20:49:54 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/soc-signed
for you to fetch changes up to 7a9819950f47dbf319895ee78220f2761f3687a3:
ARM: OMAP4: Enable fix for Cortex-A9 erratas (2013-04-08 16:14:51 -0700)
----------------------------------------------------------------
Changes needed for enabling SOC_BUS for the SoC revision
information. Also enable few HW errata workarounds for omap4.
----------------------------------------------------------------
Ruslan Bilovol (3):
ARM: OMAP2+: Move common part of late init into common function
ARM: OMAP2+: SoC name and revision unification
ARM: OMAP2+: Export SoC information to userspace
Sricharan R (1):
ARM: OMAP4: Enable fix for Cortex-A9 erratas
arch/arm/mach-omap2/Kconfig | 3 ++
arch/arm/mach-omap2/common.h | 8 ++++
arch/arm/mach-omap2/id.c | 95 ++++++++++++++++++++++++++++++++++++++++----
arch/arm/mach-omap2/io.c | 34 ++++++++--------
4 files changed, 114 insertions(+), 26 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [GIT PULL 5/5] omap dt changes for v3.10 merge window
[not found] <pull-1365483063-475562>
` (2 preceding siblings ...)
2013-04-09 4:51 ` [GIT PULL 4/5] omap soc " Tony Lindgren
@ 2013-04-09 4:51 ` Tony Lindgren
2013-04-09 13:43 ` [GIT PULL 1/5] omap pm fixes " Arnd Bergmann
[not found] ` <51639e43.d294dc0a.2f07.03b4SMTPIN_ADDED_MISSING@mx.google.com>
5 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-04-09 4:51 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 5852264f9d6139751796853fdfca9d5230cbfb97:
Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into for_3.10/dts_merged (2013-04-09 00:11:05 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/dt-signed-v2
for you to fetch changes up to 161e89a689bb88004b757986eefda2402448eef7:
ARM/dts: OMAP3: fix pinctrl-single configuration (2013-04-08 17:00:22 -0700)
----------------------------------------------------------------
Device tree updates for omaps via Benoit Cousson <b-cousson@ti.com>.
Note that the branch has dependencies to two other branches:
- omap-devel-b-for-3.10 from Paul to get the AM33xx missing
hwmod and thus avoid a regression with Santosh's hwmod
cleanup including in this DT series [1]. It avoids breaking
bisect if this series is merged before Paul's fixes.
- omap-for-v3.10/usb branch to avoid nasty merge conflict in
omap3.dtsi and omap4.dtsi due to the DTS patches contained
in the USB branch because of a screw up by the unnamed person
typing this signed tag based on Benoit's comments.
[1] https://patchwork.kernel.org/patch/2366291/
----------------------------------------------------------------
Anil Kumar (3):
ARM: dts: Add minimal DT support for DevKit8000
ARM: dts: omap3-devkit8000: Enable audio support
ARM: dts: omap3-devkit8000: Add NAND DT node
AnilKumar Ch (3):
ARM: dts: AM33XX: Rename I2C and GPIO nodes
ARM: dts: AM33XX: Add d_can instances to aliases
ARM: dts: AM33XX: Add memory resource to d_can node
Christoph Fritz (1):
ARM/dts: OMAP3: fix pinctrl-single configuration
Felipe Balbi (1):
ARM: dts: OMAP5: Add SPI nodes
Florian Vaussard (3):
ARM: dts: omap3-overo: Add support for pwm-leds
ARM: dts: omap3-overo: Add audio support
ARM: dts: OMAP3: Add GPMC controller
Javier Martinez Canillas (5):
ARM: dts: omap3: Add generic DT support for IGEP devices
ARM: dts: omap3: Add support for IGEPv2 board
ARM: dts: omap3: Add support for IGEP COM Module
ARM: dts: OMAP3: reduce GPMC mapped registers address space
Documentation: dt: gpio-omap: Move interrupt-controller from #interrupt-cells description
Jon Hunter (16):
ARM: OMAP2+: Prepare for device-tree PMU support
ARM: dts: OMAP2+: Add PMU nodes
ARM: dts: OMAP2+: Add SDMA controller bindings and nodes
ARM: dts: Add GPMC node for OMAP2, OMAP4 and OMAP5
ARM: dts: Add OMAP2 gpio bindings
ARM: dts: OMAP3+: Correct gpio #interrupts-cells property
ARM: dts: OMAP3: Add reg and interrupt properties for gpio
ARM: dts: OMAP3: Add support for OMAP3430 SDP board
ARM: OMAP: Force dmtimer restore if context loss is not detectable
ARM: OMAP: Add function to request timer by node
ARM: dts: OMAP2+: Update DMTIMER compatibility property
ARM: OMAP2+: Populate DMTIMER errata when using device-tree
ARM: dts: OMAP2+: Identify GPIO banks that are always powered
ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
ARM: dts: Add NOR flash bindings for OMAP2420 H4
ARM: dts: Add OMAP3430 SDP NOR flash memory binding
Kishon Vijay Abraham I (7):
ARM: dts: OMAP4: Add omap control usb data
ARM: dts: OMAP4: Add omap-usb2 data
ARM: dts: OMAP: Add usb_otg and glue data to OMAP3+ boards
ARM: dts: OMAP5: Add OMAP control usb data
ARM: dts: OMAP5: Add ocp2scp data
ARM: dts: OMAP5: Add omap-usb3 and omap-usb2 data
ARM: dts: OMAP5: add dwc3 omap and dwc3 core data
Lokesh Vutla (1):
ARM: dts: OMAP5: Add watchdog timer node
Matthias Brugger (1):
ARM: dts: omap3-igep: Add uart1 and uart2 to igep boards
NeilBrown (1):
ARM: OMAP: Simplify dmtimer context-loss handling
Nishanth Menon (6):
ARM: dts: OMAP34xx/35xx: Add CPU OPP table
ARM: dts: OMAP36xx: Add CPU OPP table
ARM: dts: OMAP3: use twl4030 vdd1 regulator for CPU
ARM: dts: OMAP443x: Add CPU OPP table
ARM: dts: omap4-panda: move generic sections to panda-common
ARM: dts: OMAP4460: Add CPU OPP table
Peter Ujfalusi (5):
ARM: dts: twl4030: Add PWM support
ARM: dts: twl6030: Add PWM support
ARM: dts: omap3-beagle-xm: Use pwm-leds for pmu_stat LED
ARM: dts: omap4-sdp: Add support for pwm-leds (keypad and charging LED)
ARM: dts: omap4-sdp: Add support for pwm-backlight
Philip Avinash (1):
ARM: dts: AM33XX: Corrects typo in interrupt field in SPI node
Rajendra Nayak (1):
ARM: dts: OMAP5: Specify nonsecure PPI IRQ for arch timer
Santosh Shilimkar (9):
ARM: dts: omap5-evm: Update available memory to 2032 MB
ARM: dts: OMAP5: Align the local timer dt node as per the current binding code
ARM: dts: OMAP5: Move the gic node out of ocp space
ARM: dts: OMAP5: Update the timer and GIC nodes for HYP kernel support
ARM: dts: OMAP5: Update keypad reg property
Documentation: dt: OMAP: l3-noc: Add *reg* in required properties
ARM: dts: OMAP4/5: Update l3-noc DT nodes
ARM: OMAP2+: hwmod: extract module address space from DT blob
ARM: OMAP2+: hwmod: Don't call _init_mpu_rt_base if no sysc
Sebastien Guiriec (1):
ARM: dts: OMAP2+: Add SDMA Audio IPs bindings
Sourav Poddar (4):
ARM: dts: omap4-sdp: Add I2c pinctrl data
ARM: dts: omap5-evm: Add I2c pinctrl data
ARM: dts: omap4-panda: Add I2c pinctrl data
ARM: dts: omap5-evm: Add mcspi data
Tony Lindgren (1):
Merge branch 'for_3.10/dts' of git://git.kernel.org/.../bcousson/linux-omap-dt into omap-for-v3.10/dt
.../devicetree/bindings/arm/omap/l3-noc.txt | 1 +
.../devicetree/bindings/arm/omap/timer.txt | 17 +-
.../devicetree/bindings/gpio/gpio-omap.txt | 8 +-
Documentation/devicetree/bindings/usb/omap-usb.txt | 1 +
arch/arm/boot/dts/Makefile | 4 +
arch/arm/boot/dts/am335x-bone.dts | 10 +-
arch/arm/boot/dts/am335x-evm.dts | 18 +-
arch/arm/boot/dts/am335x-evmsk.dts | 18 +-
arch/arm/boot/dts/am33xx.dtsi | 40 ++--
arch/arm/boot/dts/am3517-evm.dts | 2 +-
arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 +-
arch/arm/boot/dts/omap2.dtsi | 39 +++-
arch/arm/boot/dts/omap2420-h4.dts | 46 ++++
arch/arm/boot/dts/omap2420.dtsi | 67 +++++-
arch/arm/boot/dts/omap2430.dtsi | 87 ++++++-
arch/arm/boot/dts/omap3-beagle-xm.dts | 26 ++-
arch/arm/boot/dts/omap3-beagle.dts | 8 +-
arch/arm/boot/dts/omap3-devkit8000.dts | 169 ++++++++++++++
arch/arm/boot/dts/omap3-evm.dts | 14 +-
arch/arm/boot/dts/omap3-igep.dtsi | 122 ++++++++++
arch/arm/boot/dts/omap3-igep0020.dts | 56 +++++
arch/arm/boot/dts/omap3-igep0030.dts | 44 ++++
arch/arm/boot/dts/omap3-overo.dtsi | 31 ++-
arch/arm/boot/dts/omap3.dtsi | 142 ++++++++++--
arch/arm/boot/dts/omap3430-sdp.dts | 190 ++++++++++++++++
arch/arm/boot/dts/omap34xx.dtsi | 28 +++
arch/arm/boot/dts/omap36xx.dtsi | 13 ++
arch/arm/boot/dts/omap4-panda-a4.dts | 5 +-
arch/arm/boot/dts/omap4-panda-common.dtsi | 251 +++++++++++++++++++++
arch/arm/boot/dts/omap4-panda-es.dts | 5 +-
arch/arm/boot/dts/omap4-panda.dts | 201 +----------------
arch/arm/boot/dts/omap4-sdp.dts | 74 +++++-
arch/arm/boot/dts/omap4-var-som.dts | 2 +-
arch/arm/boot/dts/omap4.dtsi | 135 +++++++++--
arch/arm/boot/dts/omap443x.dtsi | 27 +++
arch/arm/boot/dts/omap4460.dtsi | 32 +++
arch/arm/boot/dts/omap5-evm.dts | 110 ++++++++-
arch/arm/boot/dts/omap5.dtsi | 245 +++++++++++++++++---
arch/arm/boot/dts/twl4030.dtsi | 18 +-
arch/arm/boot/dts/twl6030.dtsi | 12 +
arch/arm/mach-omap2/board-generic.c | 1 +
arch/arm/mach-omap2/omap_hwmod.c | 48 +++-
arch/arm/mach-omap2/pmu.c | 14 +-
arch/arm/mach-omap2/timer.c | 7 +-
arch/arm/plat-omap/dmtimer.c | 241 ++++++++++++--------
arch/arm/plat-omap/include/plat/dmtimer.h | 1 +
46 files changed, 2172 insertions(+), 460 deletions(-)
create mode 100644 arch/arm/boot/dts/omap3-devkit8000.dts
create mode 100644 arch/arm/boot/dts/omap3-igep.dtsi
create mode 100644 arch/arm/boot/dts/omap3-igep0020.dts
create mode 100644 arch/arm/boot/dts/omap3-igep0030.dts
create mode 100644 arch/arm/boot/dts/omap3430-sdp.dts
create mode 100644 arch/arm/boot/dts/omap34xx.dtsi
create mode 100644 arch/arm/boot/dts/omap4-panda-common.dtsi
create mode 100644 arch/arm/boot/dts/omap443x.dtsi
create mode 100644 arch/arm/boot/dts/omap4460.dtsi
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [GIT PULL 1/5] omap pm fixes for v3.10 merge window
[not found] <pull-1365483063-475562>
` (3 preceding siblings ...)
2013-04-09 4:51 ` [GIT PULL 5/5] omap dt " Tony Lindgren
@ 2013-04-09 13:43 ` Arnd Bergmann
[not found] ` <51639e43.d294dc0a.2f07.03b4SMTPIN_ADDED_MISSING@mx.google.com>
5 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2013-04-09 13:43 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Olof Johansson, linux-arm-kernel, linux-omap
On Tuesday 09 April 2013, Tony Lindgren wrote:
> The following changes since commit c309f7f46167e85d1aae2fd31f23e7d2b5cdfbe0:
>
> Merge branch 'for_3.10/omap_generic_cleanup_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/cleanup-v2 (2013-03-28 14:45:31 -0700)
>
Pulled into next/cleanup branch because of the dependency. Thanks,
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread[parent not found: <51639e43.d294dc0a.2f07.03b4SMTPIN_ADDED_MISSING@mx.google.com>]
* Re: [GIT PULL 5/5] omap dt changes for v3.10 merge window
[not found] ` <51639e43.d294dc0a.2f07.03b4SMTPIN_ADDED_MISSING@mx.google.com>
@ 2013-04-11 11:06 ` Olof Johansson
2013-04-11 16:34 ` Tony Lindgren
0 siblings, 1 reply; 7+ messages in thread
From: Olof Johansson @ 2013-04-11 11:06 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
Hi,
On Mon, Apr 08, 2013 at 09:51:03PM -0700, Tony Lindgren wrote:
> The following changes since commit 5852264f9d6139751796853fdfca9d5230cbfb97:
>
> Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into for_3.10/dts_merged (2013-04-09 00:11:05 +0200)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/dt-signed-v2
>
> for you to fetch changes up to 161e89a689bb88004b757986eefda2402448eef7:
>
> ARM/dts: OMAP3: fix pinctrl-single configuration (2013-04-08 17:00:22 -0700)
>
> ----------------------------------------------------------------
> Device tree updates for omaps via Benoit Cousson <b-cousson@ti.com>.
>
> Note that the branch has dependencies to two other branches:
>
> - omap-devel-b-for-3.10 from Paul to get the AM33xx missing
> hwmod and thus avoid a regression with Santosh's hwmod
> cleanup including in this DT series [1]. It avoids breaking
> bisect if this series is merged before Paul's fixes.
Looks like this was part of omap/fixes-non-critical, the branch name from Paul
just didn't percolate up. At least the topmost SHA from that merge in your
history seems to be part of said branch. :)
> - omap-for-v3.10/usb branch to avoid nasty merge conflict in
> omap3.dtsi and omap4.dtsi due to the DTS patches contained
> in the USB branch because of a screw up by the unnamed person
> typing this signed tag based on Benoit's comments.
Ok, it looks like this one was merged in next/drivers as omap/usb.
So based on the above, I've merged in omap/fixes-non-critical and omap/usb as
a base, and merged this on top. All of this has gone into next/dt2.
-Olof
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [GIT PULL 5/5] omap dt changes for v3.10 merge window
2013-04-11 11:06 ` [GIT PULL 5/5] omap dt changes " Olof Johansson
@ 2013-04-11 16:34 ` Tony Lindgren
0 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-04-11 16:34 UTC (permalink / raw)
To: Olof Johansson; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
* Olof Johansson <olof@lixom.net> [130411 04:11]:
> Hi,
>
> On Mon, Apr 08, 2013 at 09:51:03PM -0700, Tony Lindgren wrote:
> > The following changes since commit 5852264f9d6139751796853fdfca9d5230cbfb97:
> >
> > Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into for_3.10/dts_merged (2013-04-09 00:11:05 +0200)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/dt-signed-v2
> >
> > for you to fetch changes up to 161e89a689bb88004b757986eefda2402448eef7:
> >
> > ARM/dts: OMAP3: fix pinctrl-single configuration (2013-04-08 17:00:22 -0700)
> >
> > ----------------------------------------------------------------
> > Device tree updates for omaps via Benoit Cousson <b-cousson@ti.com>.
> >
> > Note that the branch has dependencies to two other branches:
> >
> > - omap-devel-b-for-3.10 from Paul to get the AM33xx missing
> > hwmod and thus avoid a regression with Santosh's hwmod
> > cleanup including in this DT series [1]. It avoids breaking
> > bisect if this series is merged before Paul's fixes.
>
> Looks like this was part of omap/fixes-non-critical, the branch name from Paul
> just didn't percolate up. At least the topmost SHA from that merge in your
> history seems to be part of said branch. :)
>
>
> > - omap-for-v3.10/usb branch to avoid nasty merge conflict in
> > omap3.dtsi and omap4.dtsi due to the DTS patches contained
> > in the USB branch because of a screw up by the unnamed person
> > typing this signed tag based on Benoit's comments.
>
>
> Ok, it looks like this one was merged in next/drivers as omap/usb.
>
>
> So based on the above, I've merged in omap/fixes-non-critical and omap/usb as
> a base, and merged this on top. All of this has gone into next/dt2.
OK thanks.
Tony
^ permalink raw reply [flat|nested] 7+ messages in thread