Merge commit 'origin'

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 8463efb9e0b1..02d25c743994 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -512,14 +512,13 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
         int                     count = 0;
 
         spin_lock_irqsave (&q->lock, flags);
-        for (skb = q->next; skb != (struct sk_buff *) q; skb = skbnext) {
+        skb_queue_walk_safe(q, skb, skbnext) {
                 struct skb_data         *entry;
                 struct urb              *urb;
                 int                     retval;
 
                 entry = (struct skb_data *) skb->cb;
                 urb = entry->urb;
-                skbnext = skb->next;
 
                 // during some PM-driven resume scenarios,
                 // these (async) unlinks complete immediately