diff for duplicates of <20130905.163725.106795517693348522.davem@davemloft.net>
diff --git a/a/1.txt b/N1/1.txt
index 505b3e5..e513f85 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -335,7 +335,7 @@ Bing Zhao (3):
mwifiex: do not create AP and P2P interfaces upon driver loading
mwifiex: break a long line into two lines
-Bjørn Mork (10):
+Bjørn Mork (10):
net: etherdevice: add address inherit helper
net: vlan: inherit addr_assign_type along with dev_addr
net: dsa: inherit addr_assign_type along with dev_addr
@@ -730,7 +730,7 @@ Franky Lin (4):
Fred Zhou (1):
ieee80211: add definition for 802.11ac information elements
-Frédéric Dalleau (10):
+Frédéric Dalleau (10):
Bluetooth: Use hci_connect_sco directly
Bluetooth: Remove unused mask parameter in sco_conn_defer_accept
Bluetooth: Add Bluetooth socket voice option
@@ -1122,7 +1122,7 @@ Libo Chen (19):
can: at91_can: use platform_set_drvdata()
can: flexcan: use platform_set_drvdata()
-Linus Lüssing (2):
+Linus Lüssing (2):
bridge: prevent flooding IPv6 packets that do not have a listener
bridge: apply multicast snooping to IPv6 link-local, too
@@ -1394,7 +1394,7 @@ Pravin B Shelar (14):
vxlan: Optimize vxlan rcv
vxlan: Fix kernel panic on device delete.
-RafaÅ MiÅecki (1):
+Rafał Miłecki (1):
ssb: drop BROKEN from SSB_SFLASH
Rami Rosen (3):
@@ -2895,5 +2895,4 @@ stephen hemminger (11):
create mode 100644 net/netfilter/nf_synproxy_core.c
delete mode 100644 net/netfilter/nf_tproxy_core.c
create mode 100644 net/openvswitch/vport-vxlan.c
- create mode 100644 net/sched/sch_fq.c
-ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
\ No newline at end of file
+ create mode 100644 net/sched/sch_fq.c
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index f94febd..3a1481a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -359,7 +359,7 @@
" mwifiex: do not create AP and P2P interfaces upon driver loading\n",
" mwifiex: break a long line into two lines\n",
"\n",
- "Bj\303\203\302\270rn Mork (10):\n",
+ "Bj\303\270rn Mork (10):\n",
" net: etherdevice: add address inherit helper\n",
" net: vlan: inherit addr_assign_type along with dev_addr\n",
" net: dsa: inherit addr_assign_type along with dev_addr\n",
@@ -754,7 +754,7 @@
"Fred Zhou (1):\n",
" ieee80211: add definition for 802.11ac information elements\n",
"\n",
- "Fr\303\203\302\251d\303\203\302\251ric Dalleau (10):\n",
+ "Fr\303\251d\303\251ric Dalleau (10):\n",
" Bluetooth: Use hci_connect_sco directly\n",
" Bluetooth: Remove unused mask parameter in sco_conn_defer_accept\n",
" Bluetooth: Add Bluetooth socket voice option\n",
@@ -1146,7 +1146,7 @@
" can: at91_can: use platform_set_drvdata()\n",
" can: flexcan: use platform_set_drvdata()\n",
"\n",
- "Linus L\303\203\302\274ssing (2):\n",
+ "Linus L\303\274ssing (2):\n",
" bridge: prevent flooding IPv6 packets that do not have a listener\n",
" bridge: apply multicast snooping to IPv6 link-local, too\n",
"\n",
@@ -1418,7 +1418,7 @@
" vxlan: Optimize vxlan rcv\n",
" vxlan: Fix kernel panic on device delete.\n",
"\n",
- "Rafa\303\205\302\202 Mi\303\205\302\202ecki (1):\n",
+ "Rafa\305\202 Mi\305\202ecki (1):\n",
" ssb: drop BROKEN from SSB_SFLASH\n",
"\n",
"Rami Rosen (3):\n",
@@ -2919,8 +2919,7 @@
" create mode 100644 net/netfilter/nf_synproxy_core.c\n",
" delete mode 100644 net/netfilter/nf_tproxy_core.c\n",
" create mode 100644 net/openvswitch/vport-vxlan.c\n",
- " create mode 100644 net/sched/sch_fq.c\n",
- "\303\277\303\264\303\250\302\272{.n\303\207+\302\211\302\267\302\237\302\256\302\211\302\255\302\206+%\302\212\303\213\303\277\302\261\303\251\303\235\302\266\27\302\245\302\212w\303\277\302\272{.n\303\207+\302\211\302\267\302\245\302\212{\302\261\303\276G\302\253\302\235\303\251\303\277\302\212{ay\302\272\35\303\212\302\207\303\232\302\231\303\253,j\a\302\255\302\242f\302\243\302\242\302\267h\302\232\302\217\303\257\302\201\303\252\303\277\302\221\303\252\303\247z_\303\250\302\256\3(\302\255\303\251\302\232\302\216\302\212\303\235\302\242j\"\302\235\303\272\32\302\266\em\302\247\303\277\303\277\302\276\a\302\253\303\276G\302\253\302\235\303\251\303\277\302\242\302\270?\302\231\302\250\303\250\302\255\303\232&\302\243\303\270\302\247~\302\217\303\241\302\266iO\302\225\303\246\302\254z\302\267\302\232v\303\230^\24\4\32\302\266\em\302\247\303\277\303\277\303\203\f\303\277\302\266\303\254\303\277\302\242\302\270?\302\226I\302\245"
+ " create mode 100644 net/sched/sch_fq.c"
]
-c01c71d67fe6de04e008f3eb52401266131adad245f2490d30244b2461f542e5
+ea043bb4c8aab376322c425a055d19c30481ec6a04fdb9234ed0a38318f7e2a1
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.