Merge branch 'pxa-palm' into pxa-machines
[cascardo/linux.git] / include / asm-parisc / setup.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2