Merge branches 'pxa-ian' and 'pxa-xm270' into pxa
[linux-2.6] / include / linux / rose.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2