tree 3bdb55cb86b1ffb0bd136713eec975efae4cc651
parent 7d2284b09fd967b5cad6f03c6d4a5c064f37b855
parent 121a09e590d54be840289c6feac840453aa999d9
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1200433749 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1200433749 -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:
  libata: correct handling of TSS DVD
  [libata] core checkpatch fix
  [libata] pata_bf54x: checkpatch fixes
  libata fixes for sparse-found problems