Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 26 Feb 2008 15:49:36 +0000 (07:49 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 26 Feb 2008 15:49:36 +0000 (07:49 -0800)
commit3d6ce332537ad0a6f77caa469e09d7335187767b
tree13470fb9a9e84895f15c5c688c81d57965f32d89
parent3fca96eed1cc9fb524aec536bba8ae921563f1bb
parent72ad6ec48989d4b5477128e739b960be11155036
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:
  Revert "power_state: get rid of write-only variable in SATA"
  make atapi_dmadir static