tree ba6191124786698b8da63938c20638bf97c31464
parent b419148e567728f6af0c3b01965c1cc141e3e13a
parent f38e35b43f2924b3b4e51147b7193f32e9276db4
author Linus Torvalds <torvalds@linux-foundation.org> 1257300918 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257300918 -0800

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:
  sata_via: Remove redundant device ID for VIA VT8261
  drivers/ata/libata: Move dereference after NULL test
  ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2