Merge branch 'from-jgarzik-upstream'
[linux-2.6] / arch / mips / pmc-sierra / yosemite / setup.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2