Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Oct 2008 14:47:57 +0000 (07:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Oct 2008 14:47:57 +0000 (07:47 -0700)
commitf73aaf10ae14ee8f9644b0f7abe252fe7eeb17f5
treead18afda30bf7c9b49d82e16377702c743bd3df8
parent721d5dfe7e516954c501d5e9d0dfab379cf4241a
parent9ce8e3073d9cfd6f859c22a25441db41b85cbf6e
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:
  libata: add whitelist for devices with known good pata-sata bridges
  sata_via: fix support for 5287
  libata: Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
  ATA: remove excess kernel-doc notation