diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-26 09:33:38 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-26 09:33:38 -0400 |
| commit | 35eff41288ccf2a1ddd555db0b0e51906af970a0 (patch) | |
| tree | 761d7f671ba27b4a314aa72a864f9a3a56dc7d5b /input-silence-i8042-noise.patch | |
| parent | 21694f1b769f352163ed762b519cc7155dd1c97d (diff) | |
| download | kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.gz kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.xz kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.zip | |
Linux v4.1-5596-gaefbef10e3ae
Diffstat (limited to 'input-silence-i8042-noise.patch')
| -rw-r--r-- | input-silence-i8042-noise.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/input-silence-i8042-noise.patch b/input-silence-i8042-noise.patch index 572dfb80c..d1103c244 100644 --- a/input-silence-i8042-noise.patch +++ b/input-silence-i8042-noise.patch @@ -16,10 +16,10 @@ Upstream-status: Fedora mustard 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c -index 3d874eca7104..deab7897b01f 100644 +index 30b7bbfdc558..95863902627f 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c -@@ -122,8 +122,6 @@ void device_pm_unlock(void) +@@ -123,8 +123,6 @@ void device_pm_unlock(void) */ void device_pm_add(struct device *dev) { @@ -41,7 +41,7 @@ index cb5ece77fd7d..4022b75eaad7 100644 } diff --git a/net/can/af_can.c b/net/can/af_can.c -index 32d710eaf1fc..af4a20b86ee7 100644 +index 7933e62a7318..96a911003af7 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -155,13 +155,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol, |