diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 19:18:44 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 19:19:03 +0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /drivers/isdn/i4l/isdn_ttyfax.h | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
| download | linux-7fd52392c56361a40f0c630a82b36b95ca31eac6.tar.xz | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/isdn/i4l/isdn_ttyfax.h')
| -rw-r--r-- | drivers/isdn/i4l/isdn_ttyfax.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_ttyfax.h b/drivers/isdn/i4l/isdn_ttyfax.h index 757a89010020..ccda4fcf8f7b 100644 --- a/drivers/isdn/i4l/isdn_ttyfax.h +++ b/drivers/isdn/i4l/isdn_ttyfax.h @@ -15,4 +15,3 @@ #define XON 0x11 #define XOFF 0x13 #define DC2 0x12 - |