From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 28 Dec 2011 10:47:27 +0000 (+0000)
Subject: Merge branch 'pxa/fixes-non-critical' into next/fixes-non-critical
X-Git-Tag: firefly_0821_release~3680^2~3797^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=39fbc76272225fb991ffdfac1e08974506cfa3eb;p=firefly-linux-kernel-4.4.55.git

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
---

39fbc76272225fb991ffdfac1e08974506cfa3eb