tree 13470fb9a9e84895f15c5c688c81d57965f32d89
parent 3fca96eed1cc9fb524aec536bba8ae921563f1bb
parent 72ad6ec48989d4b5477128e739b960be11155036
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1204040976 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1204040976 -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:
  Revert "power_state: get rid of write-only variable in SATA"
  make atapi_dmadir static