diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-06-13 12:12:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-13 12:12:41 +0900 |
| commit | d978006a54ddf73cdeb3c59d1862a17f4445751c (patch) | |
| tree | 407e4e37402936ef2c06bee64d8575390c3339f6 /kernel | |
| parent | f21efd45362d555b3b93960a5736ad7c6fc1f367 (diff) | |
| parent | 123df01e8e046d6065089e1bff29aa3fc48d4420 (diff) | |
Merge branch 'sh/dynamic-irq-cleanup' into sh-latest
Conflicts:
drivers/sh/intc/dynamic.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions