3dd184b843e126226867a09fc7f4955
parent 2b752acd91ecee926483b5f64a8f8bfe06e081fb
parent 3db691daa4f6c4b899e144ea54a65738402c94e3
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1205199951 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1205199951 -0700

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:
  [libata] Add support for the RB500 PATA CompactFlash
  ahci: logical-bitwise and confusion in ahci_save_initial_config()
  libata: don't allow sysfs read access to force param
  ahci: add the Device IDs for nvidia MCP7B AHCI
  libata-sff: handle controllers w/o ctl register
  libata: allow LLDs w/o any reset method
  ata: replace remaining __FUNCTION__ occurrences
	²