[GIT PULL] pxa: patches for next merge window

[Uwe Kleine-König]

Hi,

> Out of the non-PXA merge requests, the only conflicts seem to be on
> Kconfig/Makefile bits as usual, being fairly insular beyond that. While
> these are fairly easy to sort out,
Only a nice hint to whoever will merge the different arm trees in the
end: Note that next is (or recently was) broken, because git merged two
arm trees successfully (i.e. didn't result in a conflict) according to
Stephen and broke arch/arm/Kconfig with it.  See

	http://thread.gmane.org/gmane.linux.ports.arm.kernel/75250

for the exact details.

(I don't know if Stephen reports these issues to Linus anyhow, so this
mail might have been sent for nothing.)

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |