Merge branches 'ns9x' and 'machtypes' into devel
[linux-2.6] / arch / um / include / ubd_user.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2