Merge branch 'pxa/fixes-non-critical' into next/fixes-non-critical

Browse source

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

...

This commit is contained in:

Arnd Bergmann 2011-12-28 10:47:27 +00:00

parent bcdbbe3d45 3f640c61f5

commit 39fbc76272

2 changed files with 8 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

22

MAINTAINERS

View file

1

arch/arm/mach-pxa/balloon3.c

View file