diff options
author | 2013-06-20 08:08:46 -1000 | |
---|---|---|
committer | 2013-06-20 08:08:46 -1000 | |
commit | 53d5defcfa8c9603554a3174cbe206fb69f6e8ef (patch) | |
tree | 2b1429170872fce52b88f48cdef565d104fdf1df /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (diff) | |
parent | powerpc: Fix bad pmd error with book3E config (diff) | |
download | wireguard-linux-53d5defcfa8c9603554a3174cbe206fb69f6e8ef.tar.xz wireguard-linux-53d5defcfa8c9603554a3174cbe206fb69f6e8ef.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fix fro, Benjamin Herrenschmidt:
"We accidentally broke hugetlbfs on Freescale embedded processors which
use a slightly different page table layout than our server processors"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix bad pmd error with book3E config
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions