diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/w1/w1.netlink | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/w1/w1.netlink')
| -rw-r--r-- | Documentation/w1/w1.netlink | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/w1/w1.netlink b/Documentation/w1/w1.netlink index 804445f745ed..f59a31965d50 100644 --- a/Documentation/w1/w1.netlink +++ b/Documentation/w1/w1.netlink | |||
| @@ -81,7 +81,7 @@ which will contain list of all registered master ids in the following | |||
| 81 | format: | 81 | format: |
| 82 | 82 | ||
| 83 | cn_msg (CN_W1_IDX.CN_W1_VAL as id, len is equal to sizeof(struct | 83 | cn_msg (CN_W1_IDX.CN_W1_VAL as id, len is equal to sizeof(struct |
| 84 | w1_netlink_msg) plus number of masters multipled by 4) | 84 | w1_netlink_msg) plus number of masters multiplied by 4) |
| 85 | w1_netlink_msg (type: W1_LIST_MASTERS, len is equal to | 85 | w1_netlink_msg (type: W1_LIST_MASTERS, len is equal to |
| 86 | number of masters multiplied by 4 (u32 size)) | 86 | number of masters multiplied by 4 (u32 size)) |
| 87 | id0 ... idN | 87 | id0 ... idN |