aboutsummaryrefslogtreecommitdiff
path: root/Documentation/ia64/README
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 13:43:30 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 13:43:30 -0800
commit7d34f46426c4f24a6c3356d5a938798a865ec9c6 (patch)
treefc4f33785a528ed394337240d86ee896731dc39e /Documentation/ia64/README
parent6e80133f7f247f313da1638af4ce30f2bac303cc (diff)
parenta0a74d1ee2e38eb936a0437330da3a2fbc12b54e (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: sata_fsl: Split hard and soft reset
Diffstat (limited to 'Documentation/ia64/README')
0 files changed, 0 insertions, 0 deletions