Skip to content
GitLab
Explore
Sign in
Register
xcap
xcap-capability-linux
Repository
xcap-capability-linux
MAINTAINERS
Find file
Blame
History
Permalink
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
· 6ab33d51
David S. Miller
authored
Nov 20, 2008
Conflicts: drivers/net/ixgbe/ixgbe_main.c include/net/mac80211.h net/phonet/af_phonet.c
6ab33d51