]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7325d14) | patch
net: Restore unintentional reverts.
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Jun 2013 19:43:40 +0000 (12:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Jun 2013 19:43:40 +0000 (12:43 -0700)
commitbdab61d174fab3cdfe91501ee9b9ea979bac7b9e
tree9e0c673cdc9817ccaf9b31f07116d6a586de25c5tree | snapshot
parent7325d14a2a2fcc5b14bcd624dbe79956ff4973d0commit | diff
net: Restore unintentional reverts.

This restores commits:

2372cf654ea3b401f72b9fe221735a75aec2cbfc
d559cc49170df849e1951dc0505057bae379966f
6ba022036524730bcb24523f98414f266f8ec902

which initially accidently went into 'net', were
reverted there, and then properly placed into 'net-next'.
But the next net --> net-next merge accidently wiped them
out again.

Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/apple/bmac.c diff | blob | history
drivers/net/ethernet/korina.c diff | blob | history
drivers/net/ethernet/sun/sunbmac.c diff | blob | history
Linux Kernel Source Tree.