summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-26 07:49:36 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-26 07:49:36 -0800
commit3d6ce332537ad0a6f77caa469e09d7335187767b (patch)
tree13470fb9a9e84895f15c5c688c81d57965f32d89 /include
parent3fca96eed1cc9fb524aec536bba8ae921563f1bb (diff)
parent72ad6ec48989d4b5477128e739b960be11155036 (diff)
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions