summaryrefslogtreecommitdiffstats
path: root/Documentation/isdn/README.mISDN
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-14 23:36:04 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-14 23:36:04 +0100
commit249f3c4fe4fdef159d3f9b3f7a6c41a92103c860 (patch)
tree58abfec8444741fd3bd403a908be50c4f63d4842 /Documentation/isdn/README.mISDN
parentxen/hvc: constify hv_ops structures (diff)
parentLinux 4.5-rc4 (diff)
downloadlinux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.tar.xz
linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.zip
Merge 4.5-rc4 into tty-next
We want the fixes in here, and this resolves a merge error in tty_io.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/isdn/README.mISDN')
0 files changed, 0 insertions, 0 deletions