Skip to content
Commit 39fbc762 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents bcdbbe3d 3f640c61
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment