tree 5b2959425b8266db2a950f8d83fac13dda4e25f8
parent 980abe215b861891c39aba0936817c46f372143b
parent 3dcc323fe8d7158bd662c04d41ba8b25fa3ce27b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1189477379 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1189477379 -0700

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata clear horkage on ata_dev_init()
  [libata, IDE] add new VIA bridge to VIA PATA drivers
  pata_it821x: fix lost interrupt with atapi devices
  Fix broken pata_via cable detection