mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07:00
Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net>