mirror of
https://github.com/xenia-project/linux.git
synced 2026-01-31 01:35:30 +01:00
The only slightly tricky merge conflict was the netdevsim because the mutex locking fix overlapped a lot of driver reload reorganization. The rest were (relatively) trivial in nature. Signed-off-by: David S. Miller <davem@davemloft.net>