diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-11 06:23:57 +0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-11 06:23:57 +0700 |
commit | c43a5eb2698e2028cc8f6aba9c5cb35b7b154eed (patch) | |
tree | 062e2822934edb2157160eeb0cecea568a78b2ab /net/ipv4/sysctl_net_ipv4.c | |
parent | 21e20e22d4e9d6ae8504c7275049a57ad4d1b71f (diff) | |
parent | 73beb63d290f961c299526852884846b0d868840 (diff) | |
download | kernel-common-c43a5eb2698e2028cc8f6aba9c5cb35b7b154eed.tar.gz kernel-common-c43a5eb2698e2028cc8f6aba9c5cb35b7b154eed.tar.bz2 kernel-common-c43a5eb2698e2028cc8f6aba9c5cb35b7b154eed.zip |
Merge tag 'mfd-fixes-3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes
Pull MFD fix from Samuel Ortiz:
"This is the 2nd MFD pull request for 3.13
It only contains one fix for the rtsx_pcr driver. Without it we see a
kernel panic on some machines, when resuming from suspend to RAM"
* tag 'mfd-fixes-3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
mfd: rtsx_pcr: Disable interrupts before cancelling delayed works
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
0 files changed, 0 insertions, 0 deletions