Pull request: removal of most instances of mach/memory.h

[Nicolas Pitre]

On Mon, 26 Sep 2011, Nicolas Pitre wrote:

> On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> 
> > This also gives additional merge conflicts elsewhere, and while git
> > rerere makes some of them easy, the quantity is going to be a right
> > pain to deal with on a repeated basis.
> 
> Again, I'm perfectly willing to use a different base for this series and 
> fix the conflicts myself if you give me one.

Nevermind, I see that you merged it anyway.

You may consider the rerere.autoupdate config option if you want Git to 
automatically pick the conflict resolution without you manually 
confirming them all the time.


Nicolas