]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit93eb3aab717f7bc733e65cf79f5409efd04c189c
tree13470fb9a9e84895f15c5c688c81d57965f32d89
parent19620150c76d469a3a9774aa4b0ab7e0a3e3bb55
parent5f529005dc2380b8df3df621673de9509cb9b20c
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