Messages in this thread | | | Date | Fri, 3 Sep 2010 11:12:02 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the galak tree with the powerpc-merge tree |
| |
Hi Kumar,
Today's linux-next merge of the galak tree got a conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit 6d4f2fb0860c36e7ef16cc41126242a8b6542771 ("powerpc/85xx: Fix compilation of mpc85xx_mds.c") from the powerpc-merge tree and commit 5dc45967402dd124980fce88d34d7f4a012a381b ("powerpc/85xx: Fix compile error in mpc85xx_mds.c") from the galak tree.
I used the version in the powerpc-merge tree as the inititalisation of np is unnecessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |