aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440/mach-osiris.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-03 15:44:10 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-03 15:44:10 -0700
commit804b3f9a16e446cb023417faec58b6506c834052 (patch)
treea8886d723dc968c71cc69fcbd37b393bcf135740 /arch/arm/mach-s3c2440/mach-osiris.c
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (diff)
parentdrivers/ata/pata_ixp4xx_cf.c: ioremap return code check (diff)
downloadlinux-dev-804b3f9a16e446cb023417faec58b6506c834052.tar.xz
linux-dev-804b3f9a16e446cb023417faec58b6506c834052.zip
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: drivers/ata/pata_ixp4xx_cf.c: ioremap return code check Ata: pata_marvell, use ioread* for iomap-ped memory libata: fix for sata_mv >64KB DMA segments
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions