summaryrefslogtreecommitdiffstats
path: root/drivers/pci/ioapic.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-01-07 21:21:04 +0100
committerArnd Bergmann <arnd@arndb.de>2012-01-07 21:23:00 +0100
commit928a11ba36f999436915ea2b1eadf54301f93059 (patch)
tree8d7cb575d528ddd4b1165e4690401c729c1eb930 /drivers/pci/ioapic.c
parentMerge branch 'depends/rmk/for-linus' into samsung/dt (diff)
parentMerge branch 'depends/rmk/restart' into next/cleanup (diff)
downloadlinux-928a11ba36f999436915ea2b1eadf54301f93059.tar.xz
linux-928a11ba36f999436915ea2b1eadf54301f93059.zip
Merge branch 'next/cleanup' into samsung/dt
Conflicts: arch/arm/mach-exynos/common.c The common.c file gets changes from rmk/stable-devel (part of next/cleanup), rmk/restart, samsung/dt and follow-on branches from the samsung tree. Pulling it all together here hopefully avoids having to do even more conflicting merge changesets in this one file. What a mess! Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/pci/ioapic.c')
0 files changed, 0 insertions, 0 deletions