projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d94fc52
413f81e
)
Merge branch 'linus' into tracing/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 7 May 2009 09:17:13 +0000
(11:17 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 7 May 2009 09:17:34 +0000
(11:17 +0200)
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
20 files changed:
1
2
Documentation/DocBook/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/include/asm/tlbflush.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/kernel/entry_64.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/mm/kmmio.c
patch
|
diff1
|
diff2
|
blob
|
history
block/blk-core.c
patch
|
diff1
|
diff2
|
blob
|
history
block/blk-sysfs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/md/dm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sg.c
patch
|
diff1
|
diff2
|
blob
|
history
include/asm-generic/vmlinux.lds.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/init_task.h
patch
|
diff1
|
diff2
|
blob
|
history
init/main.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/irq/handle.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/lockdep.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/sched.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/softirq.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/trace/trace_branch.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/trace/trace_power.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/util.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/skbuff.c
patch
|
diff1
|
diff2
|
blob
|
history
scripts/kernel-doc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/DocBook/Makefile
Simple merge
diff --cc
arch/x86/include/asm/tlbflush.h
Simple merge
diff --cc
arch/x86/kernel/entry_64.S
Simple merge
diff --cc
arch/x86/mm/kmmio.c
Simple merge
diff --cc
block/blk-core.c
Simple merge
diff --cc
block/blk-sysfs.c
Simple merge
diff --cc
drivers/md/dm.c
Simple merge
diff --cc
drivers/scsi/sg.c
Simple merge
diff --cc
include/asm-generic/vmlinux.lds.h
Simple merge
diff --cc
include/linux/init_task.h
Simple merge
diff --cc
init/main.c
Simple merge
diff --cc
kernel/irq/handle.c
Simple merge
diff --cc
kernel/lockdep.c
Simple merge
diff --cc
kernel/sched.c
Simple merge
diff --cc
kernel/softirq.c
Simple merge
diff --cc
kernel/trace/trace_branch.c
Simple merge
diff --cc
kernel/trace/trace_power.c
Simple merge
diff --cc
mm/util.c
Simple merge
diff --cc
net/core/skbuff.c
Simple merge
diff --cc
scripts/kernel-doc
Simple merge