diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-06-03 03:49:10 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-06-03 03:49:10 +0300 |
| commit | eadcbfa58ae8693f0d6a0f591d8f51d55cf068e1 (patch) | |
| tree | cff3f1c56a8bf15138b652ee9dab50dddd6edee5 /include/uapi/linux/android/Kbuild | |
| parent | c4beedb8a914af9c8c1b6e67c753adf411e05160 (diff) | |
| parent | 5ed02dbb497422bf225783f46e6eadd237d23d6b (diff) | |
| download | linux-eadcbfa58ae8693f0d6a0f591d8f51d55cf068e1.tar.xz | |
Merge tag 'v4.12-rc3' into for-linus
Merge with mainline to get acpi_dev_present() needed by patches to
axp20x-pek driver.
Diffstat (limited to 'include/uapi/linux/android/Kbuild')
| -rw-r--r-- | include/uapi/linux/android/Kbuild | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h |