]> Pileus Git - ~andy/linux/commit
projects / ~andy / linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3717348) | 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)
commitd3c5f47ee2d16497fafaf2f26b0ffeb5c3d4e721
tree9e0c673cdc9817ccaf9b31f07116d6a586de25c5tree | snapshot
parent37173488400704f1a05656616cd12baa9e03173bcommit | diff
net: Restore unintentional reverts.

This restores commits:

c573972c111eb4c6b3f3250ad71e7c75cc799833
1a5904342c7380ceddd61c0b37544d752d0b1433
da2e2c214953f37c2a6be20226537ca5a329724c

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
Andy's Linux Kernel repo