Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus
[linux-2.6] / arch / ppc / platforms / k2.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2