summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-08-05 10:27:25 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-08-05 10:27:25 +0100
commitf15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9 (patch)
treed93b59190624c0df80854aff5078c588420c3516 /crypto
parentc89c3a6acb847b03250a83cecae4f5c9ced2d960 (diff)
parentc70fbb01b11cecfa13d9e746f462617d3ac0e38c (diff)
downloadop-kernel-dev-f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9.zip
op-kernel-dev-f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9.tar.gz
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
OpenPOWER on IntegriCloud