diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-09 23:24:53 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 23:26:20 -0700 |
| commit | a72ce69097a2709bdbda34e2f77b8388a1323923 (patch) | |
| tree | 526ea58089c5b0df7873f7d86fa3e314ec848855 /net/lapb/lapb_in.c | |
| parent | 86558257aa6716eda0ef6c94e0f579dc64fe95c3 (diff) | |
| parent | 65e8d272ba483dac3b5f724e938dda099e49a7e1 (diff) | |
Merge branch 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
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>
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions