Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/message/fusion/mptlan.c
	drivers/net/sfc/ethtool.c
	net/mac80211/debugfs_sta.c

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];