Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[linux-2.6] / arch / parisc / kernel / hardware.c
2006-01-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2006-01-11  Matthew Wilcox[PARISC] Fix Dino reporting on J2240
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2