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)
* '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>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge