diff --git a/[refs] b/[refs]
index c1157e76ad5a..78d912d96367 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23e049442b7b4f87f802470b4fd46a0e50b2fbdd
+refs/heads/master: f83347df57113e54e999aa2491be3f685c0c262d
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 6a6b352326d7..fe864885c1ed 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -1806,12 +1806,12 @@ static inline void skb_frag_set_page(struct sk_buff *skb, int f,
 
 /**
  * skb_frag_dma_map - maps a paged fragment via the DMA API
- * @device: the device to map the fragment to
+ * @dev: the device to map the fragment to
  * @frag: the paged fragment to map
  * @offset: the offset within the fragment (starting at the
  *          fragment's own offset)
  * @size: the number of bytes to map
- * @direction: the direction of the mapping (%PCI_DMA_*)
+ * @dir: the direction of the mapping (%PCI_DMA_*)
  *
  * Maps the page associated with @frag to @device.
  */