Merge branch 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup

Browse source

By Arnd Bergmann (1) and Danny Kukawka (1)
via Stephen Warren
* 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: do not hide dma declarations
  ARM: tegra: fix multiple asm/hardware/gic.h inclusion

Signed-off-by: Olof Johansson <olof@lixom.net>

...

This commit is contained in:

Olof Johansson 2012-05-09 23:24:53 -07:00

parent 86558257aa 65e8d272ba

commit a72ce69097

2 changed files with 0 additions and 5 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-tegra/board-dt-tegra20.c

View file

4

arch/arm/mach-tegra/include/mach/dma.h

View file