refresh against -rc7

SVN-Revision: 36340
This commit is contained in:
Imre Kaloz
2013-04-15 16:10:01 +00:00
parent 25ffe0446c
commit 57b68daee9
7 changed files with 9 additions and 9 deletions

View File

@@ -45,7 +45,7 @@
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -1892,16 +1896,6 @@ static inline struct sk_buff *dev_alloc_
@@ -1910,16 +1914,6 @@ static inline struct sk_buff *dev_alloc_
}