Linus Torvalds 45bfe98bd7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge ... Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's gone, gone, gone). Signed-off-by: Linus Torvalds <torvalds@osdl.org>		2006-01-12 10:21:22 -08:00
..
acorn
acpi
amba
atm
base
block	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge	2006-01-12 10:21:22 -08:00
bluetooth
cdrom
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge	2006-01-12 10:21:22 -08:00
connector
cpufreq
crypto
dio
eisa
fc4
firmware
hwmon
i2c
ide
ieee1394
infiniband
input	[PATCH] m68k: namespace pollution fix (custom->amiga_custom)	2006-01-12 09:09:00 -08:00
isdn
macintosh	[PATCH] m68k: NULL noise removal	2006-01-12 09:09:04 -08:00
mca
md
media
message
mfd
misc
mmc
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge	2006-01-12 10:21:22 -08:00
nubus
oprofile
parisc
parport
pci
pcmcia
pnp
rapidio
s390
sbus
scsi	[PATCH] m68k: fix PIO case in esp	2006-01-12 09:09:05 -08:00
serial
sh
sn
tc
telephony
usb
video	[PATCH] m68k: fix macfb init	2006-01-12 09:09:05 -08:00
w1
zorro	[PATCH] m68k: zorro __user annotations	2006-01-12 09:09:04 -08:00
Kconfig
Makefile