[U-Boot] [PATCH] Fix for MPC8360 ATM Quad OC3 External Phys

[Kim Phillips]

On Fri, 26 Nov 2010 01:35:23 -0700
"Popa Stefan-R89990" <R89990 at freescale.com> wrote:

> * Changed the CS4 and CS5 addresses on Local Bus for matching the PMC0
> and PMC1 addresses.
> 
> Signed-off-by: Stefan Popa <Stefan.Popa at freescale.com>
> ---

doesn't apply:

[u-boot master]$ git am -s -3 369
Applying: Fix for MPC8360 ATM Quad OC3 External Phys
fatal: patch fragment without header at line 19: @@ -294,13 +294,13 @@
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Fix for MPC8360 ATM Quad OC3 External Phys
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

applied manually, please make sure your next patch doesn't get mangled
next time - try emailing it to yourself, and if that doesn't work, well,
email me directly since I'm aware of a couple of issues with freescale
smtp servers.

Kim