Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this page for instructions on how to get full permissions. Sorry for the inconvenience.

source.puri.sm migrated to a new server, see new ssh key fingerprint.

Commit 64463da9 authored 15 years ago by John W. Linville

Browse files

wireless-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	net/mac80211/rate.c

parents 4a6967b8 a120e912

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 38 additions and 13 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6