]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 5.1-rc6 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Apr 2019 21:14:47 +0000 (23:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Apr 2019 21:14:47 +0000 (23:14 +0200)
commit3b5c847e7964e775bba20291904e7bfcdd6f6c6e
tree79b9aee78c58d0138ddf3f5c45ca3fcf35e07958
parentf76b1369e98028e753a2428d89d80dcdeb8681d8
parent1235a6abd75c8d03bfe89d705a905fafada5e45f
Merge 5.1-rc6 into char-misc-next

We want the fixes, and this resolves a merge error in the fastrpc
driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/fastrpc.c
drivers/misc/habanalabs/goya/goya.c