summaryrefslogtreecommitdiffstats
path: root/Documentation/DMA-ISA-LPC.txt
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-01-09 17:16:29 +0100
committerArnd Bergmann <arnd@arndb.de>2012-01-09 17:16:29 +0100
commitdcf7ec5ee62a78123057a1e286c88ca739717409 (patch)
treefa3f19434638a942ba66d236dde4d9aaadf8b370 /Documentation/DMA-ISA-LPC.txt
parentMerge branch 'drivers/rtc-sa1100' into next/drivers (diff)
parentMerge branch 'samsung/cleanup' into samsung/driver (diff)
downloadlinux-dcf7ec5ee62a78123057a1e286c88ca739717409.tar.xz
linux-dcf7ec5ee62a78123057a1e286c88ca739717409.zip
Merge branch 'samsung/driver' into next/drivers
Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/DMA-ISA-LPC.txt')
0 files changed, 0 insertions, 0 deletions