linux_dsm_epyc7002/arch
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
..
alpha
arm Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
avr32
blackfin
cris
frv
h8300
hexagon
ia64 Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
m32r
m68k Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
microblaze
mips Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
mn10300
openrisc
parisc
powerpc Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
s390 Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
score
sh Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
sparc Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
tile Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
um
unicore32 Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
x86 Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
xtensa
.gitignore
Kconfig