summaryrefslogtreecommitdiffstats
path: root/include/linux/tty_ldisc.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-10 20:24:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-10 20:24:39 -0700
commitbf83e61464803d386d0ec3fc92e5449d7963a409 (patch)
tree8bce8f80bad1650a776042cee13a7a0ba38efb6c /include/linux/tty_ldisc.h
parenta60d4b9874dc62cf0fd0d42b247baaaef75d30f8 (diff)
parent363edbe2614aa90df706c0f19ccfa2a6c06af0be (diff)
downloadblackbird-op-linux-bf83e61464803d386d0ec3fc92e5449d7963a409.tar.gz
blackbird-op-linux-bf83e61464803d386d0ec3fc92e5449d7963a409.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Ben Herrenschmidt: "Here are a handful of small powerpc fixes. A couple of section mismatches (always worth fixing), a missing export of a new symbol causing build failures of modules, a page fault deadlock fix (interestingly that bug has been around for a LONG time, though it seems to be more easily triggered by KVM) and fixing pseries default idle loop in the absence of the cpuidle drivers (such as during boot)" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Default arch idle could cede processor on pseries fbdev/ps3fb: Fix section mismatch warning for ps3fb_probe powerpc: Fix section mismatch warning for prom_rtas_call powerpc: Fix possible deadlock on page fault powerpc: Export cpu_to_chip_id() to fix build error
Diffstat (limited to 'include/linux/tty_ldisc.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud