diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-24 15:17:53 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-24 15:17:53 -0700 |
commit | 805bf3daf361a501594f8b27b394a8d7372ebe3c (patch) | |
tree | c71fe689115c7fa0f270d31fcef75fe61d81318c /arch/x86/include/asm/time.h | |
parent | 64e377dcd7d75c241d614458e9619d3445de44ef (diff) | |
parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) |
Merge 3.10-rc7 into tty-next
We want the tty fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/include/asm/time.h')
0 files changed, 0 insertions, 0 deletions