diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-09-20 15:20:38 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-09-20 15:20:38 +0200 |
| commit | 7ce7b92e4aec3af4fbc56ff6e87a8b55d2362ec1 (patch) | |
| tree | 1c0d79cda18e600bb3e9759e3f2b128a870bf20d /net/openvswitch/actions.c | |
| parent | 853c70e8dabcb1ae2c38ef2b8d40f6eb5435555b (diff) | |
| parent | b98b60167279df3acac9422c3c9820d9ebbcf9fb (diff) | |
Merge remote-tracking branch 'danvet/drm-intel-fixes' into drm-intel-testingHEADdrm-intel-testing
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_sdvo.c
Diffstat (limited to 'net/openvswitch/actions.c')
| -rw-r--r-- | net/openvswitch/actions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index f3f96badf5a..954405ceae9 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -45,7 +45,7 @@ static int make_writable(struct sk_buff *skb, int write_len) return pskb_expand_head(skb, 0, 0, GFP_ATOMIC); } -/* remove VLAN header from packet and update csum accrodingly. */ +/* remove VLAN header from packet and update csum accordingly. */ static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci) { struct vlan_hdr *vhdr; |