diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-21 08:15:06 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-21 08:15:06 -0500 |
| commit | 7f54cddfc767c29bc030a9f512c1d5e8e33f337d (patch) | |
| tree | e69a57ebce834150e4d28b230eea93ecbb6895de /firmware/WHENCE | |
| parent | 93d431e2909e0ec03127b861f4865cde89d84520 (diff) | |
| parent | 494db70db363f41da78ee5f07096cf04068d7a3e (diff) | |
Merge branch 'linux-linaro-lng-v3.18' into linux-linaro-lng-v3.18-rtlinux-lng-preempt-rt-3.18.11-2015.05linux-lng-preempt-rt-3.18.11-2015.04
Conflicts:
include/linux/interrupt.h
kernel/irq/manage.c
Diffstat (limited to 'firmware/WHENCE')
0 files changed, 0 insertions, 0 deletions