diff options
| author | Arnd Bergmann | 2011-12-28 10:47:27 +0000 |
|---|---|---|
| committer | Arnd Bergmann | 2011-12-28 10:47:27 +0000 |
| commit | 39fbc76272225fb991ffdfac1e08974506cfa3eb (patch) | |
| tree | 1e3ffcdfd8fc9199da381da95384ec7fbec515c3 /kernel | |
| parent | bcdbbe3d45fab12eb8a34eb52b89f91624dc4d6f (diff) | |
| parent | 3f640c61f582e8e770d9930c5ae1bb717b24f830 (diff) | |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions