diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-28 15:09:23 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-28 15:09:23 -0800 |
commit | 53cd1ad1a68fd10f677445e04ed63aa9ce39b36b (patch) | |
tree | c3401d2cbce4615b9a4e1d2bc060e8a310321eaa /net/ipv4/icmp.c | |
parent | d56a5ca366e785f463b4782f65daac883612a2b2 (diff) | |
parent | e13fe92bb58cf9b8f709ec18267ffc9e6ffeb016 (diff) |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Two I2C driver bugfixes.
The 'VLLS mode support' patch should have been entitled 'reconfigure
pinctrl after suspend' to make the bugfix more clear. Sorry, I missed
that, yet didn't want to rebase"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: imx-lpi2c: add VLLS mode support
i2c: i2c-cadence: Initialize configuration before probing devices
Diffstat (limited to 'net/ipv4/icmp.c')
0 files changed, 0 insertions, 0 deletions