Merge branch 'renesas/soc' into next/soc

Browse source

* renesas/soc:
  ARM: mach-shmobile: ap4evb: fixup fsi2_ak4643_info typo
  ARM: mach-shmobile: mackerel: Reserve DMA memory for the frame buffer
  ARM: mach-shmobile: Fix ag5evm compilation by including linux/videodev2.h
  ARM: mach-shmobile: Fix bonito compile breakage

...

This commit is contained in:

Arnd Bergmann 2012-03-15 18:27:15 +00:00

parent ae0b82504e 5cd9eb2736

commit 62a16d025c

4 changed files with 14 additions and 3 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

1

arch/arm/mach-shmobile/board-ag5evm.c

View file

2

arch/arm/mach-shmobile/board-ap4evb.c

View file

3

arch/arm/mach-shmobile/board-bonito.c

View file

11

arch/arm/mach-shmobile/board-mackerel.c

View file