Skip to content
GitLab
Commit 800f65bb authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6 

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h
parents 06b3cda0 b3190df6
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment