Ingo Molnar f541ae326f Merge branch 'linus' into perfcounters/core-v2 ... Merge reason: we have gathered quite a few conflicts, need to merge upstream Conflicts: arch/powerpc/kernel/Makefile arch/x86/ia32/ia32entry.S arch/x86/include/asm/hardirq.h arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/cpu/common.c arch/x86/kernel/irq.c arch/x86/kernel/syscall_table_32.S arch/x86/mm/iomap_32.c include/linux/sched.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-04-06 09:02:57 +02:00
..
accessibility
acpi	Merge branch 'linus' into perfcounters/core-v2	2009-04-06 09:02:57 +02:00
amba
ata
atm
auxdisplay
base	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask	2009-04-05 10:33:07 -07:00
block
bluetooth
cdrom
char	Merge branch 'linus' into perfcounters/core-v2	2009-04-06 09:02:57 +02:00
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac
eisa
firewire
firmware
gpio	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
gpu	Merge branch 'linus' into release	2009-04-05 02:14:15 -04:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2009-04-03 15:25:44 -07:00
hwmon	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
i2c
ide
idle
ieee1394
infiniband
input	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-04-05 11:15:54 -07:00
isdn	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
leds
lguest
macintosh
mca
md
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
memstick
message
mfd	mfd: fix da903x warning	2009-04-05 00:32:25 +02:00
misc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
mmc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	2009-04-05 10:18:21 -07:00
mtd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param	2009-04-05 10:30:21 -07:00
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
nubus
of
oprofile	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-04-05 11:04:19 -07:00
parisc
parport
pci	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-04-05 11:16:25 -07:00
pcmcia
platform	Merge branch 'linus' into release	2009-04-05 02:14:15 -04:00
pnp	Merge branch 'linus' into release	2009-04-05 02:14:15 -04:00
power	Merge branch 'linus' into release	2009-04-05 02:14:15 -04:00
ps3
rapidio
regulator
rtc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-04-05 11:15:54 -07:00
s390
sbus
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
serial	Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2009-04-05 11:15:28 -07:00
sh
sn
spi
ssb
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2009-04-05 11:06:45 -07:00
tc
telephony
thermal
uio
usb	Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2009-04-05 11:15:28 -07:00
uwb
video
virtio
w1	mfd: remove DS1WM clock handling	2009-04-05 00:32:22 +02:00
watchdog
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask	2009-04-05 10:33:07 -07:00
zorro
Kconfig
Makefile