diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-09-22 18:31:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-22 18:31:08 +0200 |
| commit | 3d98c21d064bfbb8c6fddc659471acb4950320fa (patch) | |
| tree | a506fbe4cca3616f328cdf761a45d0a09ce38237 /net/openvswitch/actions.c | |
| parent | ALSA: hda - add PCI identifier for Intel 5 Series/3400 (diff) | |
| parent | Merge tag 'v3.6-rc6' into for-3.7 (diff) | |
| download | wireguard-linux-3d98c21d064bfbb8c6fddc659471acb4950320fa.tar.xz wireguard-linux-3d98c21d064bfbb8c6fddc659471acb4950320fa.zip | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.7
Lots and lots of driver specific cleanups and enhancements but the only
substantial framework feature this time round is the compressed API
binding:
- Addition of ASoC bindings for the compressed API, used by the mid-x86
drivers.
- Lots of cleanups and API refreshes for CODEC drivers and DaVinci.
- Conversion of OMAP to dmaengine.
- New machine driver for Wolfson Microelectronics Bells.
- New CODEC driver for Wolfson Microelectronics WM0010.
Diffstat (limited to '')
| -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 f3f96badf5aa..954405ceae9e 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; |