Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (5d22df20) · Commits · Librem5 / linux

Snippets Groups Projects

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 5d22df20 authored 13 years ago by John W. Linville

Browse files

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c

parents 8b1fdb53 78feb35b

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 70 additions and 64 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