Merge branch 'master' into 85xx
[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / parisc / defpalo.conf
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2