]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm64/upstream'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:08:26 +0000 (11:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:08:26 +0000 (11:08 +1000)
commit40a1ce00a5e6c28f360af0530f76695dec3bb367
tree577f3c3ae7c0199eac09f81b0f7c89ecd7af0065
parent39d68d7ff57d32c8fd4ae3a0657090ff01a2c0fb
parentee877b5321c4dfee9dc9f2a12b19ddcd33149f6a
Merge remote-tracking branch 'arm64/upstream'

Conflicts:
include/uapi/linux/kvm.h
MAINTAINERS
include/uapi/linux/kvm.h