Ingo Molnar
eadb8a091b
Merge branch 'linus' into tracing/hw-breakpoints
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/traps.c
arch/x86/power/cpu.c
arch/x86/power/cpu_32.c
kernel/Makefile
Semantic conflict:
arch/x86/kernel/hw_breakpoint.c
Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to
put_cpu() in arch/x86/kernel/hw_breakpoint.c.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
2009-06-17 12:56:49 +02:00 |
| .. |
|
acpi
|
|
|
|
asm-generic
|
Merge branch 'linus' into tracing/hw-breakpoints
|
2009-06-17 12:56:49 +02:00 |
|
crypto
|
|
|
|
drm
|
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
|
2009-06-16 21:20:39 -07:00 |
|
keys
|
|
|
|
linux
|
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
|
2009-06-16 21:15:42 -07:00 |
|
math-emu
|
|
|
|
media
|
V4L/DVB (11933): tuner-simple, tveeprom: Add Philips FQ1216LME MK3 analog tuner
|
2009-06-16 19:07:25 -03:00 |
|
mtd
|
|
|
|
net
|
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck
|
2009-06-16 13:09:51 -07:00 |
|
pcmcia
|
|
|
|
rdma
|
|
|
|
rxrpc
|
|
|
|
scsi
|
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
2009-06-15 03:02:23 -07:00 |
|
sound
|
Merge branch 'topic/pcm-jiffies-check' into for-linus
|
2009-06-10 07:26:41 +02:00 |
|
trace
|
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
2009-06-15 03:02:23 -07:00 |
|
video
|
fbdev: s1d13xxxfb: add accelerated bitblt functions
|
2009-06-16 19:48:00 -07:00 |
|
xen
|
|
|
|
Kbuild
|
|
|