mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-02-10 05:15:57 +00:00
![Greg Kroah-Hartman](/assets/img/avatar_default.png)
This resolves the merge problem with two iio drivers that Stephen Rothwell pointed out. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>