diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-20 11:32:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-20 13:05:20 +1000 |
| commit | 2c33ce009ca2389dbf0535d0672214d09738e35e (patch) | |
| tree | 6186a6458c3c160385d794a23eaf07c786a9e61b /tools/perf/config/feature-checks/test-libpython.c | |
| parent | cec32a47010647e8b0603726ebb75b990a4057a4 (diff) | |
| parent | 09d51602cf84a1264946711dd4ea0dddbac599a1 (diff) | |
Merge Linus master into drm-next
The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.
I've included the patch into the merge to fix the build.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'tools/perf/config/feature-checks/test-libpython.c')
| -rw-r--r-- | tools/perf/config/feature-checks/test-libpython.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tools/perf/config/feature-checks/test-libpython.c b/tools/perf/config/feature-checks/test-libpython.c deleted file mode 100644 index b24b28ad6324..000000000000 --- a/tools/perf/config/feature-checks/test-libpython.c +++ /dev/null @@ -1,8 +0,0 @@ -#include <Python.h> - -int main(void) -{ - Py_Initialize(); - - return 0; -} |