This resolves a merge issue with drivers/hv/ring_buffer.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| core.c | ||
| imx-ocotp.c | ||
| Kconfig | ||
| lpc18xx_eeprom.c | ||
| Makefile | ||
| mtk-efuse.c | ||
| mxs-ocotp.c | ||
| qfprom.c | ||
| rockchip-efuse.c | ||
| sunxi_sid.c | ||
| vf610-ocotp.c | ||