leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22a3e233ca
linux/arch/sparc/kernel
History
Linus Torvalds 22a3e233ca Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Remove obsolete #include <linux/config.h>
  remove obsolete swsusp_encrypt
  arch/arm26/Kconfig typos
  Documentation/IPMI typos
  Kconfig: Typos in net/sched/Kconfig
  v9fs: do not include linux/version.h
  Documentation/DocBook/mtdnand.tmpl: typo fixes
  typo fixes: specfic -> specific
  typo fixes in Documentation/networking/pktgen.txt
  typo fixes: occuring -> occurring
  typo fixes: infomation -> information
  typo fixes: disadvantadge -> disadvantage
  typo fixes: aquire -> acquire
  typo fixes: mecanism -> mechanism
  typo fixes: bandwith -> bandwidth
  fix a typo in the RTC_CLASS help text
  smb is no longer maintained

Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
2006-06-30 15:39:30 -07:00
..
apc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
asm-offsets.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
auxio.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cpu.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
devices.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ebus.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
entry.S Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
errtbls.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
etrap.S Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
head.S Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
idprom.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
init_task.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ioport.c [SPARC]: Add of_io{remap,unmap}(). 2006-06-29 16:37:16 -07:00
irq.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
led.c [PATCH] arch/sparc/kernel/led.c __user annotations 2005-12-15 10:01:29 -08:00
Makefile [SPARC]: Port of_device layer and make ebus use it. 2006-06-23 23:15:47 -07:00
module.c [SPARC]: Handle UNWIND_INFO properly. 2006-05-12 12:45:50 -07:00
muldiv.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
of_device.c [SPARC]: sparc32 side of of_device layer IRQ resolution. 2006-06-29 16:37:40 -07:00
pcic.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
pmc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
process.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
prom.c [SPARC]: Add of_n_{addr,size}_cells(). 2006-06-29 16:37:10 -07:00
ptrace.c [PATCH] sparc: task_thread_info() 2006-01-12 09:08:53 -08:00
rtrap.S [SPARC]: Add support for *at(), ppoll, and pselect syscalls. 2006-01-19 02:42:49 -08:00
sclow.S kbuild: arm26,sparc use generic asm-offset support 2005-09-09 20:35:55 +02:00
semaphore.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
setup.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
signal.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
smp.c [SPARC]: Mark smp init functions as cpuinit 2006-06-20 00:36:10 -07:00
sparc_ksyms.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sparc-stub.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sun4c_irq.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sun4d_irq.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sun4d_smp.c [SPARC]: Try to start getting SMP back into shape. 2006-03-23 22:36:19 -08:00
sun4m_irq.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sun4m_smp.c [SPARC]: Mark smp init functions as cpuinit 2006-06-20 00:36:10 -07:00
sun4setup.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sunos_asm.S Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sunos_ioctl.c [SPARC]: Kill remaining kbio.h references. 2005-11-07 14:12:21 -08:00
sys_solaris.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sys_sparc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sys_sunos.c [PATCH] zoned vm counters: conversion of nr_pagecache to per zone counter 2006-06-30 11:25:34 -07:00
systbls.S Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
tadpole.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tick14.c [SPARC]: remove use of asm/segment.h 2005-08-29 12:45:44 -07:00
time.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
trampoline.S Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
traps.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
unaligned.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
vmlinux.lds.S [SPARC]: Use STABS_DEBUG and DWARF_DEBUG macros in vmlinux.lds.S 2005-12-28 13:22:54 -08:00
windows.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
wof.S Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
wuf.S Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00