diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 18:27:08 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 18:27:08 +0400 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /arch/avr32/include/uapi/asm/termios.h | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
| download | linux-bb799d3b980eb803ca2da4a4eefbd9308f8d988a.tar.xz | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/avr32/include/uapi/asm/termios.h')
| -rw-r--r-- | arch/avr32/include/uapi/asm/termios.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/include/uapi/asm/termios.h b/arch/avr32/include/uapi/asm/termios.h index b8ef8ea63352..c8a0081556c4 100644 --- a/arch/avr32/include/uapi/asm/termios.h +++ b/arch/avr32/include/uapi/asm/termios.h @@ -46,5 +46,4 @@ struct termio { /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ - #endif /* _UAPI__ASM_AVR32_TERMIOS_H */ |