| commit | e19553427c2e8fdb04fdd98e407164bb59a840ba | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Mon Apr 26 16:08:27 2010 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Mon Apr 26 16:08:27 2010 +0900 |
| tree | 5332234b2dad07c03c27e4608afb16f297f41e61 | |
| parent | 35f6cd4a06432034665a1499ca4b022437423aac [diff] | |
| parent | 83515bc7df812555e20cda48614674e2f346f9f5 [diff] |
Merge branch 'sh/stable-updates' Conflicts: arch/sh/kernel/dwarf.c drivers/dma/shdma.c Signed-off-by: Paul Mundt <lethal@linux-sh.org>