linux/arch/unicore32
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
..
boot arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS 2011-11-15 17:13:15 +08:00
configs unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig) 2011-06-09 16:24:42 +08:00
include unicore32, exec: remove redundant set_fs(USER_DS) 2011-11-16 10:50:09 +08:00
kernel Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
lib unicore32: fix build error for find bitops 2011-11-15 17:13:14 +08:00
mm unicore32: EXPORT_SYMBOL needs export.h 2011-10-31 19:31:06 -04:00
.gitignore unicore32 core architecture: build infrastructure 2011-03-17 09:19:05 +08:00
Kconfig unicore32: Fix typo 'PUV3_I2C' 2011-11-16 10:48:21 +08:00
Kconfig.debug unicore32: drop unused Kconfig symbols 2011-11-15 17:13:18 +08:00
Makefile unicore32: using generic-y format for one line asm-generic files 2011-06-09 16:29:52 +08:00