Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

fa9a741b

Commit fa9a741b authored 14 years ago by John W. Linville

Downloads
- Plain Diff

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

Conflicts:
	drivers/net/wireless/wl12xx/spi.c

parents 7c3ee9e3 47960077

Branches

Tags

Loading

Changes 1

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/ath/ath9k/main.c 7 additions, 1 deletion

drivers/net/wireless/ath/ath9k/main.c

with 7 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment