]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm64/upstream'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:00:53 +0000 (10:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:00:53 +0000 (10:00 +1100)
commit5a021bc594327df3455a65a46111fc9f66a58ca1
tree5d33cfba484b5af477b53d0f349452284f89e2b8
parent393d14d7486b2b846d5934da198245a5a511f7ae
parentcce72b4219eebb4c83db736bb1240e47264ca1d2
Merge remote-tracking branch 'arm64/upstream'

Conflicts:
arch/arm64/include/asm/unistd32.h
arch/arm64/include/asm/unistd32.h