diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-13 09:52:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-13 09:52:00 -0700 |
| commit | 18759462b6dd8de0f668a346cfe3776fe9370bac (patch) | |
| tree | 6811c0ccde5acc823b660ae29b4812776eca6a8a /include/net/gue.h | |
| parent | c3548b730dceecf6197d629a425c99801dadfa5e (diff) | |
| parent | 8a934ccbf90959877beec27780469e85f1c3f101 (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"Three more bug fixes for ARM SoCs this week:
- The Atmel sama5d2 was registering the wrong NFC device type
- On Atmel sam9x5, the power management controller had an incorrect
register area size
- On ARM64 Allwinner machine was not secting the generic irqchip
code, causing build errors in some configurations"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: dts: at91: sam9x5: Fix the memory range assigned to the PMC
arm64/sunxi: 4.6-rc1: Add dependency on generic irq chip
ARM: dts: at91: sama5d2: use "atmel,sama5d3-nfc" compatible for nfc
Diffstat (limited to 'include/net/gue.h')
0 files changed, 0 insertions, 0 deletions