aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/diag.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-25 13:27:36 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-25 13:27:36 -0800
commit9f9cba810f36d16f4e64477e879a69f6c47b389d (patch)
treed787abcbead1439d3f82f0719efe520fd9689f79 /arch/s390/kernel/diag.c
parentdbf5bef8da169b38db804996a661f8d634df8295 (diff)
parent949db153b6466c6f7cad5a427ecea94985927311 (diff)
downloadkernel_goldelico_gta04-9f9cba810f36d16f4e64477e879a69f6c47b389d.zip
kernel_goldelico_gta04-9f9cba810f36d16f4e64477e879a69f6c47b389d.tar.gz
kernel_goldelico_gta04-9f9cba810f36d16f4e64477e879a69f6c47b389d.tar.bz2
Merge 3.8-rc5 into tty-next
This resolves a number of tty driver merge issues found in linux-next Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/kernel/diag.c')
0 files changed, 0 insertions, 0 deletions