diff options
author | Paul Mundt | 2012-06-13 05:12:41 +0200 |
---|---|---|
committer | Paul Mundt | 2012-06-13 05:12:41 +0200 |
commit | d978006a54ddf73cdeb3c59d1862a17f4445751c (patch) | |
tree | 407e4e37402936ef2c06bee64d8575390c3339f6 /arch/sh/kernel | |
parent | Merge branch 'sh/multi-unwinders' into sh-latest (diff) | |
parent | sh: intc: Allocate subgroup virq backing desc directly. (diff) | |
download | kernel-qcow2-linux-d978006a54ddf73cdeb3c59d1862a17f4445751c.tar.gz kernel-qcow2-linux-d978006a54ddf73cdeb3c59d1862a17f4445751c.tar.xz kernel-qcow2-linux-d978006a54ddf73cdeb3c59d1862a17f4445751c.zip |
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 'arch/sh/kernel')
0 files changed, 0 insertions, 0 deletions