summaryrefslogtreecommitdiffstats
path: root/include/asm-mn10300
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-13 22:52:27 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-13 22:52:27 +0200
commitdbbcfb2211761fa69e831a78119c9288fb87eb9d (patch)
treeb40b103ed250e287bf3d4790f1c87001cf7cf52f /include/asm-mn10300
parentb0356cd0e7497252a2c45ecb07b79d931390c8b2 (diff)
parent9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff)
downloadlinux-dbbcfb2211761fa69e831a78119c9288fb87eb9d.tar.gz
linux-dbbcfb2211761fa69e831a78119c9288fb87eb9d.tar.bz2
linux-dbbcfb2211761fa69e831a78119c9288fb87eb9d.zip
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts: arch/x86/mm/ioremap.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-mn10300')
0 files changed, 0 insertions, 0 deletions