diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 11:08:27 +0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 11:08:27 +0400 |
commit | e19553427c2e8fdb04fdd98e407164bb59a840ba (patch) | |
tree | 5332234b2dad07c03c27e4608afb16f297f41e61 /arch/powerpc/sysdev/cpm2.c | |
parent | 35f6cd4a06432034665a1499ca4b022437423aac (diff) | |
parent | 83515bc7df812555e20cda48614674e2f346f9f5 (diff) | |
download | linux-e19553427c2e8fdb04fdd98e407164bb59a840ba.tar.xz |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/powerpc/sysdev/cpm2.c')
0 files changed, 0 insertions, 0 deletions