]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 3 Oct 2007 22:44:10 +0000 (15:44 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 3 Oct 2007 22:44:10 +0000 (15:44 -0700)
commitabe6ed596382a3266bac0b69352f6747b948a582
treea8886d723dc968c71cc69fcbd37b393bcf135740
parent883ce8b94f55523b21eae72b2a4f856c56b84afe
parent52f95537b087dc11fa3ef1340756a713815d06d0
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