We need the fixes in here, and it resolves a merge conflict in: drivers/misc/amd-sbi/Kconfig Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| rmi-core.c | ||
| rmi-core.h | ||
| rmi-hwmon.c | ||
| rmi-i2c.c | ||
We need the fixes in here, and it resolves a merge conflict in: drivers/misc/amd-sbi/Kconfig Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| rmi-core.c | ||
| rmi-core.h | ||
| rmi-hwmon.c | ||
| rmi-i2c.c | ||