linux-next: manual merge of the s5p tree with the arm tree
From: Stephen Rothwell
Date: Tue Dec 27 2011 - 18:33:34 EST
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5p64x0/init.c between commit 95af214becab ("ARM: 7246/1:
S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch]") from the arm tree
and commit afba7f91e640 ("ARM: SAMSUNG: remove struct
's3c24xx_uart_clksrc' and all uses of it") from the s5p tree.
I just removed the file, but the latter patch will probably need applying
in some form to arch/arm/mach-s5p64x0/common.c.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature