aha/arch/sparc/kernel
David S. Miller 2e57572a50 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:

	arch/sparc64/kernel/pci_psycho.c
2008-09-16 14:11:43 -07:00
..
apc.c sparc: Annotate of_device_id arrays with const or __initdata. 2008-08-31 01:23:17 -07:00
asm-offsets.c sparc: Remove Sparc's asm-offsets for sclow.S 2008-07-19 00:44:32 -07:00
auxio.c sparc: Convert remaining sbus_ioremap() and sbus_iounmap() users. 2008-08-29 02:15:13 -07:00
cpu.c [SPARC]: Mark linux_sparc_{fpu,chips} static. 2008-02-28 21:46:59 -08:00
devices.c sparc: remove CONFIG_SUN4 2008-08-31 20:59:37 -07:00
dma.c sparc32: Implement more generic dma_*() interfaces. 2008-08-29 02:13:14 -07:00
dma.h sparc32: Implement more generic dma_*() interfaces. 2008-08-29 02:13:14 -07:00
entry.S sparc: remove CONFIG_SUN4 2008-08-31 20:59:37 -07:00
etrap.S sparc/kernel/: possible cleanups 2008-07-17 21:37:46 -07:00
head.S sparc: remove CONFIG_SUN4 2008-08-31 20:59:37 -07:00
idprom.c sparc: remove CONFIG_SUN4 2008-08-31 20:59:37 -07:00
init_task.c [PATCH] take init_files to fs/file.c 2008-05-16 17:22:20 -04:00
ioport.c sparc: Kill now spurious includes of sbus.h 2008-08-29 02:15:23 -07:00
irq.c sparc/kernel/: possible cleanups 2008-07-17 21:37:46 -07:00
irq.h [SPARC32]: Take enable_irq/disable_irq out of line. 2007-07-21 19:19:38 -07:00
kgdb.c sparc: Add kgdb support. 2008-04-29 02:38:50 -07:00
led.c sparc: switch /proc/led to seq_file 2008-06-03 15:21:21 -07:00
Makefile sparc: remove CONFIG_SUN4 2008-08-31 20:59:37 -07:00
module.c [SPARC]: Handle UNWIND_INFO properly. 2006-05-12 12:45:50 -07:00
muldiv.c sparc: remove CVS keywords 2008-05-20 00:33:44 -07:00
of_device.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 2008-09-16 14:11:43 -07:00
pcic.c sparc: Kill EBUS driver layer. 2008-08-30 00:36:11 -07:00
pmc.c sparc: Annotate of_device_id arrays with const or __initdata. 2008-08-31 01:23:17 -07:00
process.c sparc: remove CONFIG_SUN4 2008-08-31 20:59:37 -07:00
prom.c sparc: remove CONFIG_SUN4 2008-08-31 20:59:37 -07:00
ptrace.c sparc: Fix user_regset 'n' field values. 2008-09-12 15:55:44 -07:00
rtrap.S sparc: Create and use TIF_NOTIFY_RESUME. 2008-07-27 17:33:37 -07:00
setup.c sparc32: Call parse_early_param() in setup_arch(). 2008-09-10 23:40:32 -07:00
signal.c sparc: Add call to tracehook_signal_handler(). 2008-07-27 17:33:44 -07:00
smp.c sparc/kernel/: possible cleanups 2008-07-17 21:37:46 -07:00
sparc_ksyms.c sparc32: Kill remaining asm/mostek.h inclusions. 2008-09-03 15:56:27 -07:00
sun4c_irq.c sparc: remove CONFIG_SUN4 2008-08-31 20:59:37 -07:00
sun4d_irq.c sparc32: Move sun4d show_leds() out of asm/obio.h 2008-09-08 15:40:45 -07:00
sun4d_smp.c sparc32: Move sun4d show_leds() out of asm/obio.h 2008-09-08 15:40:45 -07:00
sun4m_irq.c sparc32: Use PROM device probing for sun4m timer registers. 2008-09-13 21:37:32 -07:00
sun4m_smp.c sparc32: Implement smp_call_function_single(). 2008-08-27 20:03:22 -07:00
sys_sparc.c sparc: remove CONFIG_SUN4 2008-08-31 20:59:37 -07:00
systbls.S sparc: Wire up new system calls. 2008-07-25 15:18:31 -07:00
tadpole.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tick14.c sparc32: Kill remaining asm/mostek.h inclusions. 2008-09-03 15:56:27 -07:00
time.c sparc32: Need to close openned RTC device just like sparc64. 2008-09-10 13:36:13 -07:00
trampoline.S sparc: remove CVS keywords 2008-05-20 00:33:44 -07:00
traps.c sparc: Use new '%pS' infrastructure to print symbols. 2008-07-17 22:11:32 -07:00
una_asm.S [SPARC]: Fix link errors with gcc-4.3 2008-03-03 15:01:05 -08:00
unaligned.c sparc: remove CVS keywords 2008-05-20 00:33:44 -07:00
vmlinux.lds.S [SPARC]: Merge asm-sparc{,64}/cache.h 2008-02-09 04:17:37 -08:00
windows.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
wof.S sparc/kernel/: possible cleanups 2008-07-17 21:37:46 -07:00
wuf.S sparc/kernel/: possible cleanups 2008-07-17 21:37:46 -07:00