Merge branch 'pxa/fixes-non-critical' into next/fixes-non-critical
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Dec 2011 10:47:27 +0000 (10:47 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 28 Dec 2011 10:47:27 +0000 (10:47 +0000)
* pxa/fixes-non-critical:
  MAINTAINERS: update pxa and mmp
  ARM: pxa: Include linux/export.h in balloon3.c


Trivial merge