Ingo Molnar e1df957670 Merge branch 'linus' into perfcounters/core ... Conflicts: fs/exec.c include/linux/init_task.h Simple context conflicts.		2008-12-29 09:45:15 +01:00
..
accessibility
acpi	Merge branch 'linus' into perfcounters/core	2008-12-29 09:45:15 +01:00
amba
ata
atm	atm: Driver for Solos PCI ADSL2+ card.	2008-12-26 01:26:11 -08:00
auxdisplay
base
block	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-12-28 12:49:40 -08:00
bluetooth
cdrom
char	Merge branch 'linus' into perfcounters/core	2008-12-29 09:45:15 +01:00
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -08:00
eisa
firewire
firmware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-12-28 12:49:40 -08:00
gpio
gpu
hid
hwmon
i2c
ide	m68k: machw.h cleanup	2008-12-28 20:00:03 +01:00
idle
ieee1394
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-12-28 12:49:40 -08:00
input
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-12-28 12:49:40 -08:00
leds
lguest
macintosh	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -08:00
mca
md
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-12-28 12:49:40 -08:00
memstick
message	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-12-28 12:49:40 -08:00
mfd
misc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-12-28 12:49:40 -08:00
mmc
mtd
net	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -08:00
nubus
of
oprofile
parisc
parport
pci	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -08:00
pcmcia
pnp
power
ps3
rapidio
regulator
rtc
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-12-28 12:49:40 -08:00
sbus
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2008-12-28 12:54:07 -08:00
serial	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -08:00
sh
sn
spi
ssb
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-12-28 12:49:40 -08:00
tc
telephony
thermal
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2008-12-28 12:49:40 -08:00
uwb
video	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -08:00
virtio
w1
watchdog
xen
zorro
Kconfig
Makefile