mirror of
https://github.com/torvalds/linux.git
synced 2026-07-19 03:59:06 +02: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> |
||
|---|---|---|
| .. | ||
| 88pm860x_onkey.c | ||
| ab8500-ponkey.c | ||
| ad714x-i2c.c | ||
| ad714x-spi.c | ||
| ad714x.c | ||
| ad714x.h | ||
| adxl34x-i2c.c | ||
| adxl34x-spi.c | ||
| adxl34x.c | ||
| adxl34x.h | ||
| apanel.c | ||
| ati_remote2.c | ||
| atlas_btns.c | ||
| bfin_rotary.c | ||
| bma150.c | ||
| cm109.c | ||
| cma3000_d0x_i2c.c | ||
| cma3000_d0x.c | ||
| cma3000_d0x.h | ||
| cobalt_btns.c | ||
| dm355evm_keys.c | ||
| hp_sdc_rtc.c | ||
| ixp4xx-beeper.c | ||
| Kconfig | ||
| keyspan_remote.c | ||
| kxtj9.c | ||
| m68kspkr.c | ||
| Makefile | ||
| max8925_onkey.c | ||
| mc13783-pwrbutton.c | ||
| mma8450.c | ||
| mpu3050.c | ||
| pcap_keys.c | ||
| pcf8574_keypad.c | ||
| pcf50633-input.c | ||
| pcspkr.c | ||
| pm8xxx-vibrator.c | ||
| pmic8xxx-pwrkey.c | ||
| powermate.c | ||
| pwm-beeper.c | ||
| rb532_button.c | ||
| rotary_encoder.c | ||
| sgi_btns.c | ||
| sparcspkr.c | ||
| twl4030-pwrbutton.c | ||
| twl4030-vibra.c | ||
| twl6040-vibra.c | ||
| uinput.c | ||
| wistron_btns.c | ||
| wm831x-on.c | ||
| xen-kbdfront.c | ||
| yealink.c | ||
| yealink.h | ||