diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-04 23:46:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-04 23:46:33 +0300 |
| commit | c70672d8d316ebd46ea447effadfe57ab7a30a50 (patch) | |
| tree | 0e01283e86b028f3078285551e1dbc613a011cec /drivers/nfc | |
| parent | 09274aed9021642cb3e5e0eb0e657a13ee3eafed (diff) | |
| parent | 5c60ed283e1d87e161441bb273541a948ee96f6a (diff) | |
| download | linux-c70672d8d316ebd46ea447effadfe57ab7a30a50.tar.xz | |
Merge tag 's390-5.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik:
- Fix GENERIC_LOCKBREAK dependency on PREEMPTION in Kconfig broken
because of a typo
- Update defconfigs
* tag 's390-5.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: update defconfigs
s390: fix GENERIC_LOCKBREAK dependency typo in Kconfig
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions