tree 6cb3e6ad413d74118535f77436056c8d3cfae0eb
parent 243d58ec5792299fa212d05a4113c0ebac2df6a3
parent a323f66439c04d1c3ae4dc20cc2d44d52ee43c9f
author Arnd Bergmann <arnd@arndb.de> 1331827896 +0000
committer Arnd Bergmann <arnd@arndb.de> 1331827900 +0000

Merge branch 'fixes-non-critical' of git://github.com/hzhuang1/linux into next/maintainers

* 'fixes-non-critical' of git://github.com/hzhuang1/linux:
  MAINTAINERS: update MAINTAINERS email entry
  MAINTAINERS: update maintainer entry for pxa/hx4700

(update to v3.3-rc7)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>