leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
eadb8a091b
linux/arch
History
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
..
alpha kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
arm 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
avr32 mm: consolidate init_mm definition 2009-06-16 19:47:28 -07:00
blackfin Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
cris kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
frv mm: consolidate init_mm definition 2009-06-16 19:47:28 -07:00
h8300 kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
ia64 kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
m32r kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
m68k kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
m68knommu mm: consolidate init_mm definition 2009-06-16 19:47:28 -07:00
microblaze kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
mips Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
mn10300 kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
parisc kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
powerpc Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
s390 Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
sh kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
sparc Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
um Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
x86 Merge branch 'linus' into tracing/hw-breakpoints 2009-06-17 12:56:49 +02:00
xtensa kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
.gitignore
Kconfig hw-breakpoints: introducing generic hardware breakpoint handler interfaces 2009-06-02 22:46:58 +02:00