diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-02 08:53:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-02 08:53:02 +0100 |
| commit | 3d3e6a9e1ae798b7b5f251080f866fe01b44f933 (patch) | |
| tree | d93b59190624c0df80854aff5078c588420c3516 /crypto | |
| parent | 639e99bc624dca537d1e7a921b012f766e901d89 (diff) | |
| parent | c70fbb01b11cecfa13d9e746f462617d3ac0e38c (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/perf_event_cpu.c
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions