aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-30 20:24:34 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-10-30 20:24:34 -0500
commit95dbf5c4be080e94880ead13773d1a14eec8f4de (patch)
tree9113691b4b6c689989b4528ee0f3df3689c42066 /include/linux
parentMerge branch 'upstream' (diff)
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff)
downloadlinux-dev-95dbf5c4be080e94880ead13773d1a14eec8f4de.tar.xz
linux-dev-95dbf5c4be080e94880ead13773d1a14eec8f4de.zip
Merge branch 'master'
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions