Conflicts: arch/arm/mm/mmu.c drivers/input/keyboard/Makefile drivers/media/video/gc0309.c drivers/misc/Kconfig drivers/mmc/core/core.c drivers/regulator/Kconfig drivers/regulator/Makefile drivers/usb/gadget/f_mass_storage.c drivers/video/backlight/Makefile include/linux/fb.h include/linux/mmc/host.h |
||
|---|---|---|
| .. | ||
| ab8500.h | ||
| act8891.h | ||
| bq24022.h | ||
| charge-regulator.h | ||
| consumer.h | ||
| driver.h | ||
| fixed.h | ||
| lp3971.h | ||
| machine.h | ||
| max1586.h | ||
| max8649.h | ||
| max8660.h | ||
| rk29-pwm-regulator.h | ||
| rk2818_lp8725.h | ||
| tps6507x.h | ||
| userspace-consumer.h | ||