diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-23 15:34:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-23 15:34:13 -0700 |
| commit | 7442cf9ac2de31b33311209476cd81398d3863cf (patch) | |
| tree | 368360ef9b75e9443cea5d6e8defee529d590469 /net/l2tp/l2tp_core.h | |
| parent | 355cb09304c3387e43946a83b1fa8a34dc8976c0 (diff) | |
| parent | 6f5405bc2ee0102bb3856e2cdea64ff415db2e0c (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Ben Herrenschmidt:
"Here is a handful of powerpc fixes for 3.16. They are all pretty
simple and self contained and should still make this release"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: use _GLOBAL_TOC for memmove
powerpc/pseries: dynamically added OF nodes need to call of_node_init
powerpc: subpage_protect: Increase the array size to take care of 64TB
powerpc: Fix bugs in emulate_step()
powerpc: Disable doorbells on Power8 DD1.x
Diffstat (limited to 'net/l2tp/l2tp_core.h')
0 files changed, 0 insertions, 0 deletions