kernel: update 4.1 to 4.1.2

Changelog:
 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.2

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 46301
This commit is contained in:
Hauke Mehrtens
2015-07-11 19:59:26 +00:00
parent e0402257e5
commit 763e2502b6
5 changed files with 17 additions and 19 deletions

View File

@@ -1,6 +1,6 @@
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1146,7 +1146,7 @@ int genphy_config_init(struct phy_device
@@ -1147,7 +1147,7 @@ int genphy_config_init(struct phy_device
return 0;
}
@@ -9,7 +9,7 @@
{
/* Do nothing for now */
return 0;
@@ -1360,7 +1360,7 @@ static struct phy_driver genphy_driver[]
@@ -1361,7 +1361,7 @@ static struct phy_driver genphy_driver[]
.phy_id = 0xffffffff,
.phy_id_mask = 0xffffffff,
.name = "Generic PHY",
@@ -18,7 +18,7 @@
.config_init = genphy_config_init,
.features = PHY_GBIT_FEATURES | SUPPORTED_MII |
SUPPORTED_AUI | SUPPORTED_FIBRE |
@@ -1375,7 +1375,7 @@ static struct phy_driver genphy_driver[]
@@ -1376,7 +1376,7 @@ static struct phy_driver genphy_driver[]
.phy_id = 0xffffffff,
.phy_id_mask = 0xffffffff,
.name = "Generic 10G PHY",