linux-next: manual merge of the s5p tree with Linus' tree
From: Stephen Rothwell
Date: Mon Jul 12 2010 - 20:55:13 EST
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/configs/s5pc110_defconfig between commit
07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from
Linus' tree and commit 2976beb1dd86974ae98a992ca23a626f8be7e7dd ("ARM:
s5pv210_defconfig: Update for removing s5pc110_defconfig") from the s5p
tree.
The latter just removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp00000.pgp
Description: PGP signature