aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-14 10:57:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-14 10:57:07 -0400
commit1018cf9b0f27646c37a52a079989dc0552b2451c (patch)
treede2ae50bc8db908b170bd2375ed5b007f416ad93 /fs
parent533bb8a4d7388686243c37a414c4448ba3566f8a (diff)
parent1892225f788a73beae2ec26f6f2fa4cd2e5868d0 (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: [libata] make ali_atapi_dma static [libata] sata_svw: fix reversed port count
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions