]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm64/upstream'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 00:45:44 +0000 (10:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 00:45:44 +0000 (10:45 +1000)
commit856a84977386dea4312ea67046afadd1da9eb55a
tree18ad104cc1e60d3be9fbb27a3c35213bbfce40fb
parent0c94f407592ec25adef97eebea475b25d5212832
parent63917f0b5ba2a932d4fca7f67d1a1eae9034269e
Merge remote-tracking branch 'arm64/upstream'

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