Merge branch 'from-linus' into bcm43xx
[linux-2.6] / arch / sparc / prom / devops.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2