]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Aug 2011 05:48:30 +0000 (22:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Aug 2011 05:48:30 +0000 (22:48 -0700)
commit280c523ea011eabb2682603c01cd26cfcd11fbe6
tree8f1dff6d9b1f8314807807eecf21ee5734a4c61b
parentdcedc3292008981481d07625b83176391710fab0
parent8a2c1dbffe5028b3e7e5ea434b0b0ad18f9e1cca
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  drivers/ata/sata_dwc_460ex.c: add missing kfree
  ata: Add iMX pata support
  pata_via: disable ATAPI DMA on AVERATEC 3200
  [libata] sata_sil: fix used-uninit warning