aboutsummaryrefslogtreecommitdiff
path: root/drivers/power
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 /drivers/power
parent3e0ca2f148f97c5748f52bcf2a69dd17cb2b1d13 (diff)
parent991bf528f602882580d0918842b125255d246a19 (diff)
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 'drivers/power')
0 files changed, 0 insertions, 0 deletions