Messages in this thread | | | Date | Fri, 11 Jan 2013 15:18:28 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the samsung tree with the arm-soc tree |
| |
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in arch/arm/plat-samsung/time.c between various commits from the arm-soc tree and commit 0e4a0a6e970e ("ARM: SAMSUNG: Remove unused plat-samsung/time.c") from the samsung tree.
The latter removes the file, so I did that.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |