From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Aug 2011 05:48:30 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: next-20110822~100
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2c4ac99f983f1341b5962a16b5e8de6049bf10b5;p=karo-tx-linux.git

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
---

2c4ac99f983f1341b5962a16b5e8de6049bf10b5