Grant Likely 4e4f62bf73 Merge commit 'v2.6.35-rc6' into devicetree/next ... Conflicts: arch/sparc/kernel/prom_64.c		2010-07-24 09:49:13 -06:00
..
char	Merge commit 'v2.6.35-rc6' into devicetree/next	2010-07-24 09:49:13 -06:00
Makefile	sparc: Remove generic SBUS probing layer.	2008-08-29 02:15:21 -07:00