From: Olof Johansson <olof@lixom.net>
To: torvalds@linux-foundation.org
Cc: olof@lixom.net, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, arm@kernel.org
Subject: [GIT PULL 0/5] ARM: arm-soc: Second batch of pull requests
Date: Wed, 12 Dec 2012 17:55:43 -0800 [thread overview]
Message-ID: <20121213015543.GA18953@quad.lixom.net> (raw)
Hi Linus,
Here is the second batch of arm-soc changes for this merge window.
The first two branches have a handful of conflicts:
- The DT branch is mostly due to add/add changes but also due to some
include changes/cleanup.
- The multiplatform branch contains some dependent pinctrl patches that
seem to have been rebased either on the branch we received, or at the
pinctrl side. Unfortunately we didn't catch it when it happened. It
doesn't cause a whole lot of problems this time, luckily. We'll be
more diligent on this in the future.
As before, conflict resolution documented in each pull request, and
-resolved branches pushed up for reference.
After this, we have about another 4 branches queued up, and possibly a
few more straggling patches on top of those.
Thanks!
-Olof
next reply other threads:[~2012-12-13 1:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 1:55 Olof Johansson [this message]
2012-12-13 1:56 ` [GIT PULL 1/5] ARM: arm-soc: device tree conversions and enablement Olof Johansson
2012-12-13 1:56 ` [GIT PULL 2/5] ARM: arm-soc: multiplatform conversion patches Olof Johansson
2012-12-13 1:57 ` [GIT PULL 3/5] ARM: arm-soc: power management and clock changes Olof Johansson
2012-12-13 1:57 ` [GIT PULL 4/5] ARM: arm-soc: driver specific changes Olof Johansson
2012-12-13 1:57 ` [GIT PULL 5/5] ARM: arm-soc board updates, take 2 Olof Johansson
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=20121213015543.GA18953@quad.lixom.net \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome