diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-11-19 09:44:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-19 09:44:37 +0100 |
| commit | 3ac3ba0b396fd99550e08034b0e4c27fdf39c252 (patch) | |
| tree | f9f69fac41d66540a37a33808714d055d702328f /net/8021q/vlanproc.c | |
| parent | sched: add hierarchical accounting to cpu accounting controller (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-dev-3ac3ba0b396fd99550e08034b0e4c27fdf39c252.tar.xz linux-dev-3ac3ba0b396fd99550e08034b0e4c27fdf39c252.zip | |
Merge branch 'linus' into sched/core
Conflicts:
kernel/Makefile
Diffstat (limited to 'net/8021q/vlanproc.c')
| -rw-r--r-- | net/8021q/vlanproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index 0feefa4e1a4b..3628e0a81b40 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c @@ -314,7 +314,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset) dev_info->ingress_priority_map[6], dev_info->ingress_priority_map[7]); - seq_printf(seq, "EGRESSS priority Mappings: "); + seq_printf(seq, " EGRESS priority mappings: "); for (i = 0; i < 16; i++) { const struct vlan_priority_tci_mapping *mp = dev_info->egress_priority_map[i]; |