Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common

* android-3.18: (65 commits)
  UPSTREAM: arm64: add better page protections to arm64
  UPSTREAM: arm64: use fixmap for text patching
  UPSTREAM: arm64: remove the unnecessary arm64_swiotlb_init()
  UPSTREAM: arm64/efi: remove idmap manipulations from UEFI code
  UPSTREAM: arm64/efi: add missing call to early_ioremap_reset()
  UPSTREAM: arm64/efi: remove free_boot_services() and friends
  UPSTREAM: arm64/efi: move SetVirtualAddressMap() to UEFI stub
  UPSTREAM: arm64/efi: set EFI_ALLOC_ALIGN to 64 KB
  UPSTREAM: efi: efistub: allow allocation alignment larger than EFI_PAGE_SIZE
  UPSTREAM: efi: split off remapping code from efi_config_init()
  UPSTREAM: arm64/mm: add create_pgd_mapping() to create private page tables
  UPSTREAM: arm64/mm: add explicit struct_mm argument to __create_mapping()
  UPSTREAM: efi: efi-stub: notify on DTB absence
  UPSTREAM: arm64: dmi: set DMI string as dump stack arch description
  UPSTREAM: arm64: dmi: Add SMBIOS/DMI support
  UPSTREAM: dmi: add support for SMBIOS 3.0 64-bit entry point
  UPSTREAM: efi: dmi: add support for SMBIOS 3.0 UEFI configuration table
  UPSTREAM: arm64/efi: drop redundant set_bit(EFI_CONFIG_TABLES)
  UPSTREAM: arm64/efi: invert UEFI memory region reservation logic
  UPSTREAM: arm64/efi: set PE/COFF file alignment to 512 bytes
  ...

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

Conflicts:
	arch/arm64/Kconfig.debug
        ==> Add changes from LSK commit 62b089fa "coresight:
            moving to new "hwtracing" directory" as well as changes
            from AOSP commit 43e0bfd3 "UPSTREAM: arm64: add
            better page protections to arm64".

	arch/arm64/kernel/efi.c
	arch/arm64/kernel/setup.c
        ==> Pick changes from AOSP commits 3b9b3260 "UPSTREAM:
            arm64/efi: move SetVirtualAddressMap() to UEFI stub"
            and 40ab942b "UPSTREAM: arm64/efi: remove idmap
            manipulations from UEFI code" instead.

	drivers/firmware/dmi_scan.c
        ==> Add changes from LSK commit d9b30055 "firmware:
            dmi_scan: Fix ordering of product_uuid" as well as
            changes from AOSP commit 9390abcd "UPSTREAM: dmi:
            add support for SMBIOS 3.0 64-bit entry point".

	include/net/route.h
        ==> Pick changes from AOSP commit 83511cc4 "net: core:
            fix UID-based routing build" instead of Linaro commit
            a9e5d955 "net: core: fix Null ptr dereference in
            UID-based routing".

	lib/lz4/lz4_decompress.c
        ==> Pick changes from AOSP commit e5cf8538 "lz4: fix
            system halt at boot kernel on x86_64" instead.