diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 00:15:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 00:15:27 +0200 |
| commit | 3d15b798eafd3b6b3cc25f20747008ab9401a57f (patch) | |
| tree | 9cc140b174197048ae3f4282e09b50d0a43d3ae6 /drivers/watchdog/davinci_wdt.c | |
| parent | Merge tag 'f2fs-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/j... (diff) | |
| parent | arm64: Treat the bitops index argument as an 'int' (diff) | |
| download | linux-3d15b798eafd3b6b3cc25f20747008ab9401a57f.tar.xz linux-3d15b798eafd3b6b3cc25f20747008ab9401a57f.zip | |
Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull arm64 update from Catalin Marinas:
- Since drivers/irqchip/irq-gic.c no longer has dependencies on arm32
specifics (the 'gic' branch merged), it can be enabled on arm64.
- Enable arm64 support for poweroff/restart (for code under
drivers/power/reset/).
- Fixes (dts file, exception handling, bitops)
* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
arm64: Treat the bitops index argument as an 'int'
arm64: Ignore the 'write' ESR flag on cache maintenance faults
arm64: dts: fix #address-cells for foundation-v8
arm64: vexpress: Add support for poweroff/restart
arm64: Enable support for the ARM GIC interrupt controller
Diffstat (limited to 'drivers/watchdog/davinci_wdt.c')
0 files changed, 0 insertions, 0 deletions