Merge branch 'fixes-non-critical' of git://github.com/hzhuang1/linux into next/mainta...
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 16:11:36 +0000 (16:11 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 16:11:40 +0000 (16:11 +0000)
commit86a30bece9ad4cc91c393a829a7b128291e0fb65
tree6cb3e6ad413d74118535f77436056c8d3cfae0eb
parent243d58ec5792299fa212d05a4113c0ebac2df6a3
parenta323f66439c04d1c3ae4dc20cc2d44d52ee43c9f
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>
MAINTAINERS