-
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6John W. Linville authored
Conflicts: drivers/net/wireless/iwlwifi/iwl-commands.h
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6John W. Linville authoredConflicts: drivers/net/wireless/iwlwifi/iwl-commands.h
Loading