| commit | 5a99efeaa5c7139b7d76cbd5fb54fac664ba3da9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Aug 27 15:06:28 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Aug 27 15:06:28 2007 -0700 |
| tree | f86488005a159beb5e7fc733b3c5ab07fadb5cc2 | |
| parent | 28d9aa613daa65b295a099a8433df97de1c56a2f [diff] | |
| parent | 17a82e932d67e2885d9fa18d4656ff53337b1130 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC32]: Make flush_tlb_kernel_range() an inline function. [SERIAL]: Fix 32-bit warnings in sunzilog.c and sunsu.c [SPARC32]: Kill unused vars and macros from prom/console.c [SPARC32]: Add __cmpdi2() libcall implementation ala. MIPS. [VIDEO]: Do not prom_halt() in cg3 and bw2 device probe. [SUNVDC]: Use slice 0xff on VD_DISK_TYPE_DISK.