projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35a21b4 a081da6)
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)
commit2c4ac99f983f1341b5962a16b5e8de6049bf10b5
tree8f1dff6d9b1f8314807807eecf21ee5734a4c61btree | snapshot
parent35a21b429917baf86d7595826e7314662ec09d0acommit | diff
parenta081da630d64acf132b2db1043c586b993d49da7commit | diff
Merge branch 'upstream-linus' of git://git./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
Domain: System / Kernel;