All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Tony Lindgren <ton@atomide.com>
Cc: Olof Johansson <olof@lixom.net>,
	linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [GIT PULL 3/6] omap device tree updates for v3.8 merge window
Date: Thu, 15 Nov 2012 17:04:00 +0000	[thread overview]
Message-ID: <201211151704.00309.arnd@arndb.de> (raw)
In-Reply-To: <0MaLIe-1TsCr93bz6-00K6Wu@mx.kundenserver.de>

On Tuesday 13 November 2012, Tony Lindgren wrote:
> The following changes since commit edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a:
> 
>   Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-09 14:58:01 -0800)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/dt-signed
> 
> for you to fetch changes up to d308ba50a1234b299a00e63a95e61fdeb2f1a2df:
> 
>   Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt (2012-11-09 14:58:34 -0800)
> 
> ----------------------------------------------------------------
> 
> Device tree related changes for omaps updating the
> various .dts files, and timer related changes to allow
> configuring the timer via device tree.

I've ended up pulling the prcm cleanup into this branch as well, in order
to resolve a conflict where we add a new machine descriptor here and the
other branch changes all machine descriptors not to use 
omap_prcm_restart.

	Arnd

WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 3/6] omap device tree updates for v3.8 merge window
Date: Thu, 15 Nov 2012 17:04:00 +0000	[thread overview]
Message-ID: <201211151704.00309.arnd@arndb.de> (raw)
In-Reply-To: <0MaLIe-1TsCr93bz6-00K6Wu@mx.kundenserver.de>

On Tuesday 13 November 2012, Tony Lindgren wrote:
> The following changes since commit edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a:
> 
>   Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-09 14:58:01 -0800)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/dt-signed
> 
> for you to fetch changes up to d308ba50a1234b299a00e63a95e61fdeb2f1a2df:
> 
>   Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt (2012-11-09 14:58:34 -0800)
> 
> ----------------------------------------------------------------
> 
> Device tree related changes for omaps updating the
> various .dts files, and timer related changes to allow
> configuring the timer via device tree.

I've ended up pulling the prcm cleanup into this branch as well, in order
to resolve a conflict where we add a new machine descriptor here and the
other branch changes all machine descriptors not to use 
omap_prcm_restart.

	Arnd

       reply	other threads:[~2012-11-15 17:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <0MaLIe-1TsCr93bz6-00K6Wu@mx.kundenserver.de>
2012-11-15 17:04 ` Arnd Bergmann [this message]
2012-11-15 17:04   ` [GIT PULL 3/6] omap device tree updates for v3.8 merge window Arnd Bergmann
     [not found] <pull-1352828737-887235>
2012-11-13 19:10 ` Tony Lindgren
2012-11-13 19:10   ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201211151704.00309.arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=ton@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.