diff options
| author | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:30:07 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:30:07 (GMT) |
| commit | e5fc662387b40984ed4b7a14477cc659f4d80b94 (patch) | |
| tree | cf60ec2e653100003e59216306e241a4485c7d4f /Documentation/watchdog/watchdog-kernel-api.txt | |
| parent | fa2b857e85998a6843c1a6843446ff00067fa3a4 (diff) | |
| parent | 38bff34aef9a92ba18386e801604824856883b32 (diff) | |
| download | linux-fsl-qoriq-e5fc662387b40984ed4b7a14477cc659f4d80b94.tar.xz | |
Merge branch 'rtmerge'
Signed-off-by: Scott Wood <scottwood@freescale.com>
Conflicts:
arch/arm/kvm/mmu.c
arch/arm/mm/proc-v7-3level.S
arch/powerpc/kernel/vdso32/getcpu.S
drivers/crypto/caam/error.c
drivers/crypto/caam/sg_sw_sec4.h
drivers/usb/host/ehci-fsl.c
Diffstat (limited to 'Documentation/watchdog/watchdog-kernel-api.txt')
0 files changed, 0 insertions, 0 deletions