* linux-next: manual merge of the pinctrl tree with the battery tree
@ 2013-02-04 5:45 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-02-04 5:45 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-next, linux-kernel, Jonas Aaberg, Anton Vorontsov,
Lee Jones, Linus Walleij
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
include/linux/mfd/abx500/ab8500.h between commit 0ed5107fa860
("ab8500-charger: Do not touch VBUSOVV bits") from the battery tree and
commit 56813f798e8c ("mfd: ab8500: update header file and version
detection") from the pinctrl tree.
I fixed it up (the former is a subset of the latter) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-04 5:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-04 5:45 linux-next: manual merge of the pinctrl tree with the battery tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).