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)
commit39fbc76272225fb991ffdfac1e08974506cfa3eb
tree1e3ffcdfd8fc9199da381da95384ec7fbec515c3
parentbcdbbe3d45fab12eb8a34eb52b89f91624dc4d6f
parent3f640c61f582e8e770d9930c5ae1bb717b24f830
Merge branch 'pxa/fixes-non-critical' into next/fixes-non-critical

* pxa/fixes-non-critical:
  MAINTAINERS: update pxa and mmp
  ARM: pxa: Include linux/export.h in balloon3.c