diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-16 15:19:05 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-16 15:19:05 -0700 |
| commit | 13a29d9ad242f0bf3b31afe812c81558d54892de (patch) | |
| tree | 455bd114c6fd0c9188d6b85c690877d40231d946 /arch/powerpc/mm/hugetlbpage.c | |
| parent | ad689af687fa7ee83fe560744f700393fd879015 (diff) | |
| parent | 66ff7c376168a46ce5556ba42ee1c0abe302cbd0 (diff) | |
Merge branch 'v3.18/topic/android/aosp-fixes' into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.06-android
* v3.18/topic/android/aosp-fixes:
net/Kconfig: paranoid only for android
android: configs: base: enable IPV6
Diffstat (limited to 'arch/powerpc/mm/hugetlbpage.c')
0 files changed, 0 insertions, 0 deletions