davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22a3e233ca
kernel-ark/drivers
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
..
acorn Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
acpi Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
amba [PATCH] 64bit resource: fix up printks for resources in misc drivers 2006-06-27 09:23:59 -07:00
atm Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
base Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
block Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
bluetooth Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cdrom Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
char Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
clocksource
connector
cpufreq Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
crypto
dio
dma
edac Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
eisa Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
fc4 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
firmware Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
hwmon Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
i2c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
ide Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
ieee1394 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
infiniband Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
input Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
isdn Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
leds Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
macintosh Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mca
md Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
media Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
message Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mfd Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
misc Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mmc Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mtd Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
nubus Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
oprofile
parisc Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
parport Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
pci Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
pcmcia Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
pnp Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
rapidio Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
rtc fix a typo in the RTC_CLASS help text 2006-06-30 18:18:41 +02:00
s390 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sbus Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
scsi Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
serial Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
sh
sn Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
spi Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
tc Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
telephony Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6 2006-06-29 14:19:21 -07:00
usb Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
video Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
w1
zorro Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Kconfig
Makefile