Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
[linux-2.6] / arch / ppc64 / kernel / prom_init.c
2005-05-03  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-01  Anton Blanchard[PATCH] ppc64: firmware workaround
2005-05-01  Paul Mackerras[PATCH] ppc64: tell firmware about kernel capabilities
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2