projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8b9a4d5
836dc9e
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Fri, 8 Feb 2013 23:02:14 +0000
(18:02 -0500)
committer
David S. Miller
<davem@davemloft.net>
Fri, 8 Feb 2013 23:02:14 +0000
(18:02 -0500)
Synchronize with 'net' in order to sort out some l2tp, wireless, and
ipv6 GRE fixes that will be built on top of in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
16 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/bcma/bcma_private.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/bcma/driver_gpio.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/bcma/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx4/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/usb/cdc_ncm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/brcm80211/brcmsmac/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/xen-netback/interface.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/ssb/driver_gpio.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/ssb/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/ssb/ssb_private.h
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp_input.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/ip6_gre.c
patch
|
diff1
|
diff2
|
blob
|
history
net/l2tp/l2tp_core.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sctp/auth.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/bcma/bcma_private.h
Simple merge
diff --cc
drivers/bcma/driver_gpio.c
Simple merge
diff --cc
drivers/bcma/main.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge
diff --cc
drivers/net/usb/cdc_ncm.c
Simple merge
diff --cc
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Simple merge
diff --cc
drivers/net/wireless/brcm80211/brcmsmac/main.c
Simple merge
diff --cc
drivers/net/xen-netback/interface.c
Simple merge
diff --cc
drivers/ssb/driver_gpio.c
Simple merge
diff --cc
drivers/ssb/main.c
Simple merge
diff --cc
drivers/ssb/ssb_private.h
Simple merge
diff --cc
net/ipv4/tcp_input.c
Simple merge
diff --cc
net/ipv6/ip6_gre.c
Simple merge
diff --cc
net/l2tp/l2tp_core.c
Simple merge
diff --cc
net/sctp/auth.c
Simple merge