* linux-next: manual merge of the sh tree with the sh-current tree
@ 2010-12-26 22:45 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2010-12-26 22:45 UTC (permalink / raw)
To: Paul Mundt; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Hi Paul,
Today's linux-next merge of the sh tree got a conflict in
arch/sh/kernel/cpu/sh2a/clock-sh7201.c between commit
27f1acccd4d310e941d2e879445324595e2fe463 ("sh: Fix up SH7201 clkfwk
build") from the sh-current tree and commit
16b259203c513ed28bd31cc9a981e0d3ad517943 ("sh: migrate SH_CLK_MD to mode
pin API") from the sh tree.
The latter includes the fix from the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-12-26 22:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-26 22:45 linux-next: manual merge of the sh tree with the sh-current 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
all inboxes | Powered by JetHome®