diff options
author | 2007-02-17 00:18:23 -0500 | |
---|---|---|
committer | 2007-02-17 00:18:23 -0500 | |
commit | e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7 (patch) | |
tree | 7e5745bea06675cfce60d6813ee3b4d5e19cbb56 /scripts/Makefile.host | |
parent | Linux 2.6.20 (diff) | |
parent | [PATCH] use __u64 rather than u64 in parisc statfs structs (diff) | |
download | linux-dev-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.tar.xz linux-dev-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 'scripts/Makefile.host')
0 files changed, 0 insertions, 0 deletions