Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 ... This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file, and it fixes the build error in the arch/x86/kernel/microcode_core.c file, that the merge did not catch. The microcode_core.c patch was provided by Stephen Rothwell <sfr@canb.auug.org.au> who was invaluable in the merge issues involved with the large sysdev removal process in the driver-core tree. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2012-01-06 11:42:52 -08:00
..
cpu	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
vsyscall	mm: arch: rename in_gate_area_no_task to in_gate_area_no_mm	2011-03-23 16:36:55 -04:00
.gitignore
asm-offsets.c
cpufreq.c
crash_dump.c	crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn	2011-03-23 19:47:19 -07:00
debugtraps.S
disassemble.c
dma-nommu.c
dumpstack.c	sh: remove warning and warning_symbol from struct stacktrace_ops	2011-05-23 14:42:15 +09:00
dwarf.c
entry-common.S
ftrace.c
head_32.S
head_64.S
hw_breakpoint.c
idle.c	sh: Fix up fallout from cpuidle changes.	2011-08-08 16:30:11 +09:00
init_task.c
io_trapped.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
io.c
iomap.c
ioport.c
irq_32.c
irq_64.c
irq.c	sh: use printk_ratelimited instead of printk_ratelimit	2011-06-30 15:10:06 +09:00
kdebugfs.c
kgdb.c
kprobes.c
localtimer.c
machine_kexec.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
machvec.c
Makefile
module.c	modules: make arch's use default loader hooks	2011-07-24 22:06:04 +09:30
nmi_debug.c
perf_callchain.c	sh: remove warning and warning_symbol from struct stacktrace_ops	2011-05-23 14:42:15 +09:00
perf_event.c	sh: Add export.h to arch/sh specific files as required.	2011-10-31 19:31:05 -04:00
process_32.c	sh, exec: remove redundant set_fs(USER_DS)	2011-06-14 15:15:58 +09:00
process_64.c
process.c	sh: Fix build alloc_thread_info_node function	2011-03-24 15:19:14 +09:00
ptrace_32.c	perf: Add context field to perf_event	2011-07-01 11:06:38 +02:00
ptrace_64.c	sh: Fix ptrace fpu state initialisation	2011-03-23 22:17:52 +09:00
ptrace.c
reboot.c
relocate_kernel.S
return_address.c
setup.c	sh: kexec: Register crashk_res	2011-09-05 13:10:50 +09:00
sh_bios.c
sh_ksyms_32.c
sh_ksyms_64.c
signal_32.c
signal_64.c
smp.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
stacktrace.c	sh: remove warning and warning_symbol from struct stacktrace_ops	2011-05-23 14:42:15 +09:00
swsusp.c
sys_sh32.c
sys_sh64.c
sys_sh.c
syscalls_32.S	sh: Wire up process_vm syscalls.	2011-11-11 10:58:16 +09:00
syscalls_64.S	sh: Wire up process_vm syscalls.	2011-11-11 10:58:16 +09:00
time.c
topology.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
traps_32.c	sh: Add unaligned memory access for PC relative intructions	2011-08-29 15:32:10 +09:00
traps_64.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
traps.c
unwinder.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
vmlinux.lds.S	sh: kexec: Add PHYSICAL_START	2011-10-28 15:03:43 +09:00