[GIT PULL] i.MX cleanups for next

[Arnd Bergmann]

On Saturday 27 August 2011 13:14:26 Sascha Hauer wrote:
> > I got conflicts between these patches and the gpio cleanups in Russell's
> > gpio branch. For now, I have reverted Shawn's patches so that we
> > can get build coverage of the rest in linux-next without annoying
> > Stephen too much.
> 
> I don't know the situation exactly at the moment, but I remember that
> Shawn originally sent the patches based on rmks patchset. I reworked
> them to fit onto mainline to be able to apply them and decided that
> the conflicts were easy enough to solve upstream.

Ok, I can have another look on monday, maybe I just didn't look hard
enough to figure out how to resolve them.

	Arnd