diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 08:33:45 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 08:35:04 -0400 |
| commit | 8cef081c71dd4e16a01a1e63cedab21eef8b5735 (patch) | |
| tree | b5b0fb5ab09dc60dee5fc8fd8e980359abbd1b1e /include/linux/tipc_config.h | |
| parent | 3d55c29fb24286f350f04021bef2dd799e25dd20 (diff) | |
| parent | 9161c3b796a2841a9a7be3d9c9dd121269ce90e8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fixes
The merge of the 'clk-for-linus' branch caused an automated
merge failure. Pull that in here so we can fix the problem.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/tipc_config.h')
| -rw-r--r-- | include/linux/tipc_config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/tipc_config.h b/include/linux/tipc_config.h index 9730b0e51e46..c98928420100 100644 --- a/include/linux/tipc_config.h +++ b/include/linux/tipc_config.h | |||
| @@ -102,8 +102,8 @@ | |||
| 102 | #define TIPC_CMD_SET_LINK_TOL 0x4107 /* tx link_config, rx none */ | 102 | #define TIPC_CMD_SET_LINK_TOL 0x4107 /* tx link_config, rx none */ |
| 103 | #define TIPC_CMD_SET_LINK_PRI 0x4108 /* tx link_config, rx none */ | 103 | #define TIPC_CMD_SET_LINK_PRI 0x4108 /* tx link_config, rx none */ |
| 104 | #define TIPC_CMD_SET_LINK_WINDOW 0x4109 /* tx link_config, rx none */ | 104 | #define TIPC_CMD_SET_LINK_WINDOW 0x4109 /* tx link_config, rx none */ |
| 105 | #define TIPC_CMD_SET_LOG_SIZE 0x410A /* tx unsigned, rx none */ | 105 | #define TIPC_CMD_SET_LOG_SIZE 0x410A /* obsoleted */ |
| 106 | #define TIPC_CMD_DUMP_LOG 0x410B /* tx none, rx ultra_string */ | 106 | #define TIPC_CMD_DUMP_LOG 0x410B /* obsoleted */ |
| 107 | #define TIPC_CMD_RESET_LINK_STATS 0x410C /* tx link_name, rx none */ | 107 | #define TIPC_CMD_RESET_LINK_STATS 0x410C /* tx link_name, rx none */ |
| 108 | 108 | ||
| 109 | /* | 109 | /* |