Re: linux-next: manual merge of the spi tree with the jc_docs tree
From: Mark Brown
Date: Fri Mar 20 2015 - 08:33:20 EST
On Fri, Mar 20, 2015 at 04:23:54PM +1100, Stephen Rothwell wrote:
> Clearly the one commit in the jc_docs tree is supposed to do the same
> as three commits in the spi tree. The jc_docs tree version has an
> older Author date, but a newer commit date ...
> I fixed it up (by using the spi tree version of the file) and can carry
> the fix as necessary (no action is required).
That's the fix I'd expect, thanks.
> BTW, there is a function in there called "unespcape" whose comment
> calls it "Unescape" which would make more sense.
Description: Digital signature