archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the moduleh tree with the s5p tree
@ 2011-10-13  6:25 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-10-13  6:25 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Kukjin Kim

[-- Attachment #1: Type: text/plain, Size: 943 bytes --]

Hi Paul,

Today's linux-next merge of the moduleh tree got conflicts in
arch/arm/plat-s3c24xx/devs.c, arch/arm/plat-s5p/dev-ehci.c,
arch/arm/plat-s5p/dev-onenand.c, arch/arm/plat-samsung/dev-adc.c,
arch/arm/plat-samsung/dev-asocdma.c, arch/arm/plat-samsung/dev-ide.c,
arch/arm/plat-samsung/dev-nand.c, arch/arm/plat-samsung/dev-pwm.c,
arch/arm/plat-samsung/dev-rtc.c, arch/arm/plat-samsung/dev-ts.c,
arch/arm/plat-samsung/dev-usb.c and arch/arm/plat-samsung/dev-wdt.c
between commits from the s5p tree and commits 8d7f68e196ec ("arm: fix
implicit use of asm/sizes.h in plat-s5p/plat-samsung") and 1c28ea1c50da
("arm: Add export.h to ARM specific files as required") from the moduleh

The s5p tree commits effectively removed these files, so I did that.
Hopefully the fixups from the moduleh tree are no longer required or
covered by other changes.
Stephen Rothwell          

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-10-13  6:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-13  6:25 linux-next: manual merge of the moduleh tree with the s5p 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).