Skip to content
Commit b67afe7f authored by John W. Linville's avatar John W. Linville
Browse files

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 

Conflicts:
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
parents db28569a 28bec7b8
Hide whitespace changes
Inline Side-by-side
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