summaryrefslogtreecommitdiff
path: root/Documentation/input
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-18 19:24:24 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-18 19:24:24 (GMT)
commit5d5b1b9f79ebad81215d11e208e9bfa9679a4ddd (patch)
tree7a8824fce3e8fbd8856eb08d71b81ab1867f096a /Documentation/input
parentadff377bb1010ec65aada1f94ef2be7c7805c711 (diff)
parent7b84b29b8c2711fe64e0dba4db22f02ce0f16015 (diff)
downloadlinux-fsl-qoriq-5d5b1b9f79ebad81215d11e208e9bfa9679a4ddd.tar.xz
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/powermac: Build fix with SMP and CPU hotplug powerpc/perf_event: Skip updating kernel counters if register value shrinks powerpc: Don't write protect kernel text with CONFIG_DYNAMIC_FTRACE enabled powerpc: Fix oops if scan_dispatch_log is called too early powerpc/pseries: Use a kmem cache for DTL buffers powerpc/kexec: Fix regression causing compile failure on UP powerpc/85xx: disable Suspend support if SMP enabled powerpc/e500mc: Remove CPU_FTR_MAYBE_CAN_NAP/CPU_FTR_MAYBE_CAN_DOZE powerpc/book3e: Fix CPU feature handling on 64-bit e5500 powerpc: Check device status before adding serial device powerpc/85xx: Don't add disabled PCIe devices
Diffstat (limited to 'Documentation/input')
0 files changed, 0 insertions, 0 deletions