diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 10:27:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 10:27:25 +0100 |
| commit | f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9 (patch) | |
| tree | d93b59190624c0df80854aff5078c588420c3516 /crypto | |
| parent | c89c3a6acb847b03250a83cecae4f5c9ced2d960 (diff) | |
| parent | c70fbb01b11cecfa13d9e746f462617d3ac0e38c (diff) | |
| download | talos-obmc-linux-f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9.tar.gz talos-obmc-linux-f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9.zip | |
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
