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
..
acpi	ACPI: support acpi_device_ops .notify methods	2009-04-05 02:25:07 -04:00
asm-arm
asm-frv	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
asm-generic	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
asm-h8300
asm-m32r	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
asm-mn10300	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
crypto
drm	drm: remove unused "can_grow" parameter from drm_crtc_helper_initial_config	2009-04-03 10:21:44 +10:00
keys
linux	Merge branch 'linus' into perfcounters/core-v2	2009-04-06 09:02:57 +02:00
math-emu
media	V4L/DVB (11313): v4l2-subdev: add enum_framesizes and enum_frameintervals.	2009-03-30 12:43:49 -03:00
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-04-02 21:05:30 -07:00
pcmcia
rdma
rxrpc
scsi
sound	V4L/DVB (10771): tea575x-tuner: convert it to V4L2 API	2009-03-30 12:43:02 -03:00
trace	tracing, net: fix net tree and tracing tree merge interaction	2009-04-02 00:50:30 +02:00
video	fbdev: update s1d13xxxfb to differ between revisions and production ids	2009-04-01 08:59:32 -07:00
xen
Kbuild