mirror of
https://github.com/torvalds/linux.git
synced 2025-01-01 07:42:07 +00:00
ff4b8a57f0
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> |
||
|---|---|---|
| .. | ||
| bond_3ad.c | ||
| bond_3ad.h | ||
| bond_alb.c | ||
| bond_alb.h | ||
| bond_debugfs.c | ||
| bond_ipv6.c | ||
| bond_main.c | ||
| bond_procfs.c | ||
| bond_sysfs.c | ||
| bonding.h | ||
| Makefile | ||