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

eca6fc78

Commit eca6fc78 authored 14 years ago by David S. Miller

Downloads
- Plain Diff

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

parents da5cabf8 5ca6f7c8

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/ath/ath5k/base.c 21 additions, 0 deletions

drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/eeprom.h 1 addition, 0 deletions

drivers/net/wireless/ath/ath9k/eeprom.h
drivers/net/wireless/ath/ath9k/eeprom_9287.c 6 additions, 1 deletion

drivers/net/wireless/ath/ath9k/eeprom_9287.c
drivers/net/wireless/ath/ath9k/hif_usb.c 2 additions, 6 deletions

drivers/net/wireless/ath/ath9k/hif_usb.c
drivers/net/wireless/ath/ath9k/htc_drv_init.c 1 addition, 0 deletions

drivers/net/wireless/ath/ath9k/htc_drv_init.c
drivers/net/wireless/ath/ath9k/htc_drv_main.c 2 additions, 1 deletion

drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c 10 additions, 5 deletions

drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
drivers/net/wireless/ath/ath9k/reg.h 1 addition, 0 deletions

drivers/net/wireless/ath/ath9k/reg.h
drivers/net/wireless/ipw2x00/ipw2100.c 3 additions, 2 deletions

drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/wl12xx/wl1251_cmd.c 1 addition, 1 deletion

drivers/net/wireless/wl12xx/wl1251_cmd.c
net/ipv6/route.c 2 additions, 2 deletions

net/ipv6/route.c
net/netlink/af_netlink.c 6 additions, 16 deletions

net/netlink/af_netlink.c
net/xfrm/xfrm_user.c 1 addition, 1 deletion

net/xfrm/xfrm_user.c

with 57 additions and 35 deletions

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