David S. Miller e9011d0866 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc ...

Conflicts:
	arch/sparc/mm/init_64.c

Conflict was simple non-overlapping additions.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-08-05 18:57:18 -07:00

..

char

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

2014-08-05 18:57:18 -07:00

Makefile

sparc: Remove generic SBUS probing layer.

2008-08-29 02:15:21 -07:00