aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-01-24 21:24:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-24 21:24:53 +0000
commit6c0eab663bb616003f7b1cc5d13c6c865c0860fd (patch)
tree341c1a1f5b29022a62df8f1c89fe3d4eff6b1491
parent47eade6b68ddd7472fe76453d6c2fec1a5381a65 (diff)
parent51f1745143847de763506796fea19e0e0e498141 (diff)
downloadkernel-headers-6c0eab663bb616003f7b1cc5d13c6c865c0860fd.tar.gz
am 51f17451: am 8115a9fb: Merge "external/kernel-headers: rename aarch64 target to arm64"
* commit '51f1745143847de763506796fea19e0e0e498141': external/kernel-headers: rename aarch64 target to arm64
-rw-r--r--original/uapi/asm-arm64/asm/auxvec.h (renamed from original/uapi/asm-aarch64/asm/auxvec.h)0
-rw-r--r--original/uapi/asm-arm64/asm/bitsperlong.h (renamed from original/uapi/asm-aarch64/asm/bitsperlong.h)0
-rw-r--r--original/uapi/asm-arm64/asm/byteorder.h (renamed from original/uapi/asm-aarch64/asm/byteorder.h)0
-rw-r--r--original/uapi/asm-arm64/asm/errno.h (renamed from original/uapi/asm-aarch64/asm/errno.h)0
-rw-r--r--original/uapi/asm-arm64/asm/fcntl.h (renamed from original/uapi/asm-aarch64/asm/fcntl.h)0
-rw-r--r--original/uapi/asm-arm64/asm/hwcap.h (renamed from original/uapi/asm-aarch64/asm/hwcap.h)0
-rw-r--r--original/uapi/asm-arm64/asm/ioctl.h (renamed from original/uapi/asm-aarch64/asm/ioctl.h)0
-rw-r--r--original/uapi/asm-arm64/asm/ioctls.h (renamed from original/uapi/asm-aarch64/asm/ioctls.h)0
-rw-r--r--original/uapi/asm-arm64/asm/ipcbuf.h (renamed from original/uapi/asm-aarch64/asm/ipcbuf.h)0
-rw-r--r--original/uapi/asm-arm64/asm/kvm_para.h (renamed from original/uapi/asm-aarch64/asm/kvm_para.h)0
-rw-r--r--original/uapi/asm-arm64/asm/mman.h (renamed from original/uapi/asm-aarch64/asm/mman.h)0
-rw-r--r--original/uapi/asm-arm64/asm/msgbuf.h (renamed from original/uapi/asm-aarch64/asm/msgbuf.h)0
-rw-r--r--original/uapi/asm-arm64/asm/param.h (renamed from original/uapi/asm-aarch64/asm/param.h)0
-rw-r--r--original/uapi/asm-arm64/asm/poll.h (renamed from original/uapi/asm-aarch64/asm/poll.h)0
-rw-r--r--original/uapi/asm-arm64/asm/posix_types.h (renamed from original/uapi/asm-aarch64/asm/posix_types.h)0
-rw-r--r--original/uapi/asm-arm64/asm/ptrace.h (renamed from original/uapi/asm-aarch64/asm/ptrace.h)0
-rw-r--r--original/uapi/asm-arm64/asm/resource.h (renamed from original/uapi/asm-aarch64/asm/resource.h)0
-rw-r--r--original/uapi/asm-arm64/asm/sembuf.h (renamed from original/uapi/asm-aarch64/asm/sembuf.h)0
-rw-r--r--original/uapi/asm-arm64/asm/setup.h (renamed from original/uapi/asm-aarch64/asm/setup.h)0
-rw-r--r--original/uapi/asm-arm64/asm/shmbuf.h (renamed from original/uapi/asm-aarch64/asm/shmbuf.h)0
-rw-r--r--original/uapi/asm-arm64/asm/sigcontext.h (renamed from original/uapi/asm-aarch64/asm/sigcontext.h)0
-rw-r--r--original/uapi/asm-arm64/asm/siginfo.h (renamed from original/uapi/asm-aarch64/asm/siginfo.h)0
-rw-r--r--original/uapi/asm-arm64/asm/signal.h (renamed from original/uapi/asm-aarch64/asm/signal.h)0
-rw-r--r--original/uapi/asm-arm64/asm/socket.h (renamed from original/uapi/asm-aarch64/asm/socket.h)0
-rw-r--r--original/uapi/asm-arm64/asm/sockios.h (renamed from original/uapi/asm-aarch64/asm/sockios.h)0
-rw-r--r--original/uapi/asm-arm64/asm/stat.h (renamed from original/uapi/asm-aarch64/asm/stat.h)0
-rw-r--r--original/uapi/asm-arm64/asm/statfs.h (renamed from original/uapi/asm-aarch64/asm/statfs.h)0
-rw-r--r--original/uapi/asm-arm64/asm/swab.h (renamed from original/uapi/asm-aarch64/asm/swab.h)0
-rw-r--r--original/uapi/asm-arm64/asm/termbits.h (renamed from original/uapi/asm-aarch64/asm/termbits.h)0
-rw-r--r--original/uapi/asm-arm64/asm/termios.h (renamed from original/uapi/asm-aarch64/asm/termios.h)0
-rw-r--r--original/uapi/asm-arm64/asm/types.h (renamed from original/uapi/asm-aarch64/asm/types.h)0
-rw-r--r--original/uapi/asm-arm64/asm/unistd.h (renamed from original/uapi/asm-aarch64/asm/unistd.h)0
32 files changed, 0 insertions, 0 deletions
diff --git a/original/uapi/asm-aarch64/asm/auxvec.h b/original/uapi/asm-arm64/asm/auxvec.h
index 22d6d88..22d6d88 100644
--- a/original/uapi/asm-aarch64/asm/auxvec.h
+++ b/original/uapi/asm-arm64/asm/auxvec.h
diff --git a/original/uapi/asm-aarch64/asm/bitsperlong.h b/original/uapi/asm-arm64/asm/bitsperlong.h
index fce9c29..fce9c29 100644
--- a/original/uapi/asm-aarch64/asm/bitsperlong.h
+++ b/original/uapi/asm-arm64/asm/bitsperlong.h
diff --git a/original/uapi/asm-aarch64/asm/byteorder.h b/original/uapi/asm-arm64/asm/byteorder.h
index 2b92046..2b92046 100644
--- a/original/uapi/asm-aarch64/asm/byteorder.h
+++ b/original/uapi/asm-arm64/asm/byteorder.h
diff --git a/original/uapi/asm-aarch64/asm/errno.h b/original/uapi/asm-arm64/asm/errno.h
index 4c82b50..4c82b50 100644
--- a/original/uapi/asm-aarch64/asm/errno.h
+++ b/original/uapi/asm-arm64/asm/errno.h
diff --git a/original/uapi/asm-aarch64/asm/fcntl.h b/original/uapi/asm-arm64/asm/fcntl.h
index cd2e630..cd2e630 100644
--- a/original/uapi/asm-aarch64/asm/fcntl.h
+++ b/original/uapi/asm-arm64/asm/fcntl.h
diff --git a/original/uapi/asm-aarch64/asm/hwcap.h b/original/uapi/asm-arm64/asm/hwcap.h
index eea4975..eea4975 100644
--- a/original/uapi/asm-aarch64/asm/hwcap.h
+++ b/original/uapi/asm-arm64/asm/hwcap.h
diff --git a/original/uapi/asm-aarch64/asm/ioctl.h b/original/uapi/asm-arm64/asm/ioctl.h
index b279fe0..b279fe0 100644
--- a/original/uapi/asm-aarch64/asm/ioctl.h
+++ b/original/uapi/asm-arm64/asm/ioctl.h
diff --git a/original/uapi/asm-aarch64/asm/ioctls.h b/original/uapi/asm-arm64/asm/ioctls.h
index ec34c76..ec34c76 100644
--- a/original/uapi/asm-aarch64/asm/ioctls.h
+++ b/original/uapi/asm-arm64/asm/ioctls.h
diff --git a/original/uapi/asm-aarch64/asm/ipcbuf.h b/original/uapi/asm-arm64/asm/ipcbuf.h
index 84c7e51..84c7e51 100644
--- a/original/uapi/asm-aarch64/asm/ipcbuf.h
+++ b/original/uapi/asm-arm64/asm/ipcbuf.h
diff --git a/original/uapi/asm-aarch64/asm/kvm_para.h b/original/uapi/asm-arm64/asm/kvm_para.h
index 14fab8f..14fab8f 100644
--- a/original/uapi/asm-aarch64/asm/kvm_para.h
+++ b/original/uapi/asm-arm64/asm/kvm_para.h
diff --git a/original/uapi/asm-aarch64/asm/mman.h b/original/uapi/asm-arm64/asm/mman.h
index 8eebf89..8eebf89 100644
--- a/original/uapi/asm-aarch64/asm/mman.h
+++ b/original/uapi/asm-arm64/asm/mman.h
diff --git a/original/uapi/asm-aarch64/asm/msgbuf.h b/original/uapi/asm-arm64/asm/msgbuf.h
index 809134c..809134c 100644
--- a/original/uapi/asm-aarch64/asm/msgbuf.h
+++ b/original/uapi/asm-arm64/asm/msgbuf.h
diff --git a/original/uapi/asm-aarch64/asm/param.h b/original/uapi/asm-arm64/asm/param.h
index 8e3a281..8e3a281 100644
--- a/original/uapi/asm-aarch64/asm/param.h
+++ b/original/uapi/asm-arm64/asm/param.h
diff --git a/original/uapi/asm-aarch64/asm/poll.h b/original/uapi/asm-arm64/asm/poll.h
index c98509d..c98509d 100644
--- a/original/uapi/asm-aarch64/asm/poll.h
+++ b/original/uapi/asm-arm64/asm/poll.h
diff --git a/original/uapi/asm-aarch64/asm/posix_types.h b/original/uapi/asm-arm64/asm/posix_types.h
index 22cae62..22cae62 100644
--- a/original/uapi/asm-aarch64/asm/posix_types.h
+++ b/original/uapi/asm-arm64/asm/posix_types.h
diff --git a/original/uapi/asm-aarch64/asm/ptrace.h b/original/uapi/asm-arm64/asm/ptrace.h
index 6913643..6913643 100644
--- a/original/uapi/asm-aarch64/asm/ptrace.h
+++ b/original/uapi/asm-arm64/asm/ptrace.h
diff --git a/original/uapi/asm-aarch64/asm/resource.h b/original/uapi/asm-arm64/asm/resource.h
index 04bc4db..04bc4db 100644
--- a/original/uapi/asm-aarch64/asm/resource.h
+++ b/original/uapi/asm-arm64/asm/resource.h
diff --git a/original/uapi/asm-aarch64/asm/sembuf.h b/original/uapi/asm-arm64/asm/sembuf.h
index 7673b83..7673b83 100644
--- a/original/uapi/asm-aarch64/asm/sembuf.h
+++ b/original/uapi/asm-arm64/asm/sembuf.h
diff --git a/original/uapi/asm-aarch64/asm/setup.h b/original/uapi/asm-arm64/asm/setup.h
index 9cf2e46..9cf2e46 100644
--- a/original/uapi/asm-aarch64/asm/setup.h
+++ b/original/uapi/asm-arm64/asm/setup.h
diff --git a/original/uapi/asm-aarch64/asm/shmbuf.h b/original/uapi/asm-arm64/asm/shmbuf.h
index 83c05fc..83c05fc 100644
--- a/original/uapi/asm-aarch64/asm/shmbuf.h
+++ b/original/uapi/asm-arm64/asm/shmbuf.h
diff --git a/original/uapi/asm-aarch64/asm/sigcontext.h b/original/uapi/asm-arm64/asm/sigcontext.h
index 690ad51..690ad51 100644
--- a/original/uapi/asm-aarch64/asm/sigcontext.h
+++ b/original/uapi/asm-arm64/asm/sigcontext.h
diff --git a/original/uapi/asm-aarch64/asm/siginfo.h b/original/uapi/asm-arm64/asm/siginfo.h
index 5a74a08..5a74a08 100644
--- a/original/uapi/asm-aarch64/asm/siginfo.h
+++ b/original/uapi/asm-arm64/asm/siginfo.h
diff --git a/original/uapi/asm-aarch64/asm/signal.h b/original/uapi/asm-arm64/asm/signal.h
index 8d1e723..8d1e723 100644
--- a/original/uapi/asm-aarch64/asm/signal.h
+++ b/original/uapi/asm-arm64/asm/signal.h
diff --git a/original/uapi/asm-aarch64/asm/socket.h b/original/uapi/asm-arm64/asm/socket.h
index 6b71384..6b71384 100644
--- a/original/uapi/asm-aarch64/asm/socket.h
+++ b/original/uapi/asm-arm64/asm/socket.h
diff --git a/original/uapi/asm-aarch64/asm/sockios.h b/original/uapi/asm-arm64/asm/sockios.h
index def6d47..def6d47 100644
--- a/original/uapi/asm-aarch64/asm/sockios.h
+++ b/original/uapi/asm-arm64/asm/sockios.h
diff --git a/original/uapi/asm-aarch64/asm/stat.h b/original/uapi/asm-arm64/asm/stat.h
index eeb702e..eeb702e 100644
--- a/original/uapi/asm-aarch64/asm/stat.h
+++ b/original/uapi/asm-arm64/asm/stat.h
diff --git a/original/uapi/asm-aarch64/asm/statfs.h b/original/uapi/asm-arm64/asm/statfs.h
index 6f62190..6f62190 100644
--- a/original/uapi/asm-aarch64/asm/statfs.h
+++ b/original/uapi/asm-arm64/asm/statfs.h
diff --git a/original/uapi/asm-aarch64/asm/swab.h b/original/uapi/asm-arm64/asm/swab.h
index 7847e56..7847e56 100644
--- a/original/uapi/asm-aarch64/asm/swab.h
+++ b/original/uapi/asm-arm64/asm/swab.h
diff --git a/original/uapi/asm-aarch64/asm/termbits.h b/original/uapi/asm-arm64/asm/termbits.h
index 3935b10..3935b10 100644
--- a/original/uapi/asm-aarch64/asm/termbits.h
+++ b/original/uapi/asm-arm64/asm/termbits.h
diff --git a/original/uapi/asm-aarch64/asm/termios.h b/original/uapi/asm-arm64/asm/termios.h
index 280d78a..280d78a 100644
--- a/original/uapi/asm-aarch64/asm/termios.h
+++ b/original/uapi/asm-arm64/asm/termios.h
diff --git a/original/uapi/asm-aarch64/asm/types.h b/original/uapi/asm-arm64/asm/types.h
index b9e79bc..b9e79bc 100644
--- a/original/uapi/asm-aarch64/asm/types.h
+++ b/original/uapi/asm-arm64/asm/types.h
diff --git a/original/uapi/asm-aarch64/asm/unistd.h b/original/uapi/asm-arm64/asm/unistd.h
index 1caadc2..1caadc2 100644
--- a/original/uapi/asm-aarch64/asm/unistd.h
+++ b/original/uapi/asm-arm64/asm/unistd.h