summaryrefslogtreecommitdiffstats
path: root/Documentation/ioctl
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 02:49:45 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 02:49:45 +0200
commit3c803e8e2f15d02c5ad0a3888eea2bbd31dc59c5 (patch)
treef4c2e5316784cc670b95afee338e611e94e4252c /Documentation/ioctl
parent[PATCH] ide: sensible probing for PCI systems (diff)
downloadlinux-3c803e8e2f15d02c5ad0a3888eea2bbd31dc59c5.tar.xz
linux-3c803e8e2f15d02c5ad0a3888eea2bbd31dc59c5.zip
Commit the manual part of the input layer merge.
git did actually warn me about the fact that I hadn't actually done an "update-cache" on these two files, but the warning was at the bottom of a list of all the files that _did_ change in the merge, so I never noticed. My bad.
Diffstat (limited to 'Documentation/ioctl')
0 files changed, 0 insertions, 0 deletions