David S. Miller 98d86c0915 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 ... Conflicts: arch/sparc/kernel/of_device.c		2008-09-08 15:39:30 -07:00
..
fault.c	sparc: Use new '%pS' infrastructure to print symbols.	2008-07-17 22:11:32 -07:00
generic.c	sparc64: remove CVS keywords	2008-05-20 00:33:43 -07:00
hugetlbpage.c	hugetlb: introduce pud_huge	2008-07-24 10:47:18 -07:00
init.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2008-09-08 15:39:30 -07:00
Makefile	sparc64: remove CVS keywords	2008-05-20 00:33:43 -07:00
tlb.c	[SPARC64]: Don't open-code {get,put}_cpu_var() in flush_tlb_pending().	2008-03-28 15:53:25 -07:00
tsb.c	sparc64: Need to disable preemption around smp_tsb_sync().	2008-08-04 13:51:35 -07:00
ultra.S	sparc64: Don't MAGIC_SYSRQ ifdef smp_fetch_global_regs and support code.	2008-08-09 16:25:26 -07:00