projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1f4246 2d5fcc9)
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Nov 2011 01:55:01 +0000 (23:55 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Nov 2011 01:55:01 +0000 (23:55 -0200)
* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
  pata_of_platform: Don't use NO_IRQ
  [libata] ahci: Add ASMedia ASM1061 support
  [libata] Issue SRST to Sil3726 PMP
  sata_sis.c: trivial spelling fix
  ahci_platform: use dev_get_platdata()
  [libata] libata-scsi.c: Add function parameter documentation


Trivial merge