summaryrefslogtreecommitdiffstats
path: root/drivers/char/rio
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2007-02-17 06:18:23 +0100
committerKyle McMartin <kyle@parisc-linux.org>2007-02-17 06:18:23 +0100
commite7b3ca08549caccf5d6e1cf066780bf4f0ae77a7 (patch)
tree7e5745bea06675cfce60d6813ee3b4d5e19cbb56 /drivers/char/rio
parentLinux 2.6.20 (diff)
parent[PATCH] use __u64 rather than u64 in parisc statfs structs (diff)
downloadlinux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.tar.xz
linux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.zip
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
Conflicts: arch/parisc/hpux/sys_hpux.c arch/parisc/mm/ioremap.c
Diffstat (limited to 'drivers/char/rio')
0 files changed, 0 insertions, 0 deletions