mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-04-18 10:23:08 +02:00
211c17aaee
Conflicts: drivers/net/wireless/ath/ath9k/main.c net/bluetooth/hci_event.c