mirror of
https://github.com/torvalds/linux
synced 2026-06-19 17:32:08 +09:00
This resolves the merge issues and confusions people were having with the goldfish drivers due to changes for them showing up in two different trees. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>