diff options
author | 2014-07-23 15:34:13 -0700 | |
---|---|---|
committer | 2014-07-23 15:34:13 -0700 | |
commit | 7442cf9ac2de31b33311209476cd81398d3863cf (patch) | |
tree | 368360ef9b75e9443cea5d6e8defee529d590469 /drivers/input/touchscreen/ti_am335x_tsc.c | |
parent | Merge tag 'urgent-slab-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm (diff) | |
parent | powerpc: use _GLOBAL_TOC for memmove (diff) | |
download | linux-dev-7442cf9ac2de31b33311209476cd81398d3863cf.tar.xz linux-dev-7442cf9ac2de31b33311209476cd81398d3863cf.zip |
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 'drivers/input/touchscreen/ti_am335x_tsc.c')
0 files changed, 0 insertions, 0 deletions