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
atm
base	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
block
bluetooth
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
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
fc4
firmware
hwmon
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
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
input
isdn
leds
macintosh
mca
md
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
message
mfd
misc
mmc
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
nubus
oprofile
parisc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
parport
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
rapidio
rtc
s390
sbus
scsi
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
sh
sn
spi
tc
telephony
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
Kconfig
Makefile