diff -druNp linux-libre-3.0.78-gnu1/arch/arm/mach-omap2/board-rx51-peripherals.c linux-libre-3.0.79-gnu1/arch/arm/mach-omap2/board-rx51-peripherals.c
--- linux-libre-3.0.78-gnu1/arch/arm/mach-omap2/board-rx51-peripherals.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/arch/arm/mach-omap2/board-rx51-peripherals.c	2013-05-19 13:05:47.000000000 -0400
@@ -56,11 +56,11 @@
 
 #define RX51_USB_TRANSCEIVER_RST_GPIO	67
 
-/* list all spi devices here */
+/* List all SPI devices here. Note that the list/probe order seems to matter! */
 enum {
 	RX51_SPI_WL1251,
-	RX51_SPI_MIPID,		/* LCD panel */
 	RX51_SPI_TSC2005,	/* Touch Controller */
+	RX51_SPI_MIPID,		/* LCD panel */
 };
 
 static struct wl12xx_platform_data wl1251_pdata;
diff -druNp linux-libre-3.0.78-gnu1/arch/x86/kvm/vmx.c linux-libre-3.0.79-gnu1/arch/x86/kvm/vmx.c
--- linux-libre-3.0.78-gnu1/arch/x86/kvm/vmx.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/arch/x86/kvm/vmx.c	2013-05-19 13:05:47.000000000 -0400
@@ -3836,6 +3836,12 @@ static int handle_invalid_guest_state(st
 		if (err != EMULATE_DONE)
 			return 0;
 
+		if (vcpu->arch.halt_request) {
+			vcpu->arch.halt_request = 0;
+			ret = kvm_emulate_halt(vcpu);
+			goto out;
+		}
+
 		if (signal_pending(current))
 			goto out;
 		if (need_resched())
diff -druNp linux-libre-3.0.78-gnu1/arch/x86/xen/enlighten.c linux-libre-3.0.79-gnu1/arch/x86/xen/enlighten.c
--- linux-libre-3.0.78-gnu1/arch/x86/xen/enlighten.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/arch/x86/xen/enlighten.c	2013-05-19 13:05:47.000000000 -0400
@@ -129,6 +129,21 @@ static void xen_vcpu_setup(int cpu)
 
 	BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info);
 
+	/*
+	 * This path is called twice on PVHVM - first during bootup via
+	 * smp_init -> xen_hvm_cpu_notify, and then if the VCPU is being
+	 * hotplugged: cpu_up -> xen_hvm_cpu_notify.
+	 * As we can only do the VCPUOP_register_vcpu_info once lets
+	 * not over-write its result.
+	 *
+	 * For PV it is called during restore (xen_vcpu_restore) and bootup
+	 * (xen_setup_vcpu_info_placement). The hotplug mechanism does not
+	 * use this function.
+	 */
+	if (xen_hvm_domain()) {
+		if (per_cpu(xen_vcpu, cpu) == &per_cpu(xen_vcpu_info, cpu))
+			return;
+	}
 	if (cpu < MAX_VIRT_CPUS)
 		per_cpu(xen_vcpu,cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu];
 
diff -druNp linux-libre-3.0.78-gnu1/drivers/acpi/acpica/exfldio.c linux-libre-3.0.79-gnu1/drivers/acpi/acpica/exfldio.c
--- linux-libre-3.0.78-gnu1/drivers/acpi/acpica/exfldio.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/acpi/acpica/exfldio.c	2013-05-19 13:05:47.000000000 -0400
@@ -702,7 +702,19 @@ acpi_ex_extract_from_field(union acpi_op
 
 	if ((obj_desc->common_field.start_field_bit_offset == 0) &&
 	    (obj_desc->common_field.bit_length == access_bit_width)) {
-		status = acpi_ex_field_datum_io(obj_desc, 0, buffer, ACPI_READ);
+		if (buffer_length >= sizeof(u64)) {
+			status =
+			    acpi_ex_field_datum_io(obj_desc, 0, buffer,
+						   ACPI_READ);
+		} else {
+			/* Use raw_datum (u64) to handle buffers < 64 bits */
+
+			status =
+			    acpi_ex_field_datum_io(obj_desc, 0, &raw_datum,
+						   ACPI_READ);
+			ACPI_MEMCPY(buffer, &raw_datum, buffer_length);
+		}
+
 		return_ACPI_STATUS(status);
 	}
 
diff -druNp linux-libre-3.0.78-gnu1/drivers/acpi/ec.c linux-libre-3.0.79-gnu1/drivers/acpi/ec.c
--- linux-libre-3.0.78-gnu1/drivers/acpi/ec.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/acpi/ec.c	2013-05-19 13:05:47.000000000 -0400
@@ -217,7 +217,7 @@ static int ec_check_sci_sync(struct acpi
 static int ec_poll(struct acpi_ec *ec)
 {
 	unsigned long flags;
-	int repeat = 2; /* number of command restarts */
+	int repeat = 5; /* number of command restarts */
 	while (repeat--) {
 		unsigned long delay = jiffies +
 			msecs_to_jiffies(ec_delay);
@@ -235,8 +235,6 @@ static int ec_poll(struct acpi_ec *ec)
 			}
 			advance_transaction(ec, acpi_ec_read_status(ec));
 		} while (time_before(jiffies, delay));
-		if (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF)
-			break;
 		pr_debug(PREFIX "controller reset, restart transaction\n");
 		spin_lock_irqsave(&ec->curr_lock, flags);
 		start_transaction(ec);
diff -druNp linux-libre-3.0.78-gnu1/drivers/block/drbd/drbd_receiver.c linux-libre-3.0.79-gnu1/drivers/block/drbd/drbd_receiver.c
--- linux-libre-3.0.78-gnu1/drivers/block/drbd/drbd_receiver.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/block/drbd/drbd_receiver.c	2013-05-19 13:05:47.000000000 -0400
@@ -2225,7 +2225,6 @@ static int drbd_asb_recover_1p(struct dr
 		if (hg == -1 && mdev->state.role == R_PRIMARY) {
 			enum drbd_state_rv rv2;
 
-			drbd_set_role(mdev, R_SECONDARY, 0);
 			 /* drbd_change_state() does not sleep while in SS_IN_TRANSIENT_STATE,
 			  * we might be here in C_WF_REPORT_PARAMS which is transient.
 			  * we do not need to wait for the after state change work either. */
diff -druNp linux-libre-3.0.78-gnu1/drivers/char/ipmi/ipmi_bt_sm.c linux-libre-3.0.79-gnu1/drivers/char/ipmi/ipmi_bt_sm.c
--- linux-libre-3.0.78-gnu1/drivers/char/ipmi/ipmi_bt_sm.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/char/ipmi/ipmi_bt_sm.c	2013-05-19 13:05:47.000000000 -0400
@@ -95,9 +95,9 @@ struct si_sm_data {
 	enum bt_states	state;
 	unsigned char	seq;		/* BT sequence number */
 	struct si_sm_io	*io;
-	unsigned char	write_data[IPMI_MAX_MSG_LENGTH];
+	unsigned char	write_data[IPMI_MAX_MSG_LENGTH + 2]; /* +2 for memcpy */
 	int		write_count;
-	unsigned char	read_data[IPMI_MAX_MSG_LENGTH];
+	unsigned char	read_data[IPMI_MAX_MSG_LENGTH + 2]; /* +2 for memcpy */
 	int		read_count;
 	int		truncated;
 	long		timeout;	/* microseconds countdown */
diff -druNp linux-libre-3.0.78-gnu1/drivers/char/ipmi/ipmi_devintf.c linux-libre-3.0.79-gnu1/drivers/char/ipmi/ipmi_devintf.c
--- linux-libre-3.0.78-gnu1/drivers/char/ipmi/ipmi_devintf.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/char/ipmi/ipmi_devintf.c	2013-05-19 13:05:47.000000000 -0400
@@ -838,13 +838,25 @@ static long compat_ipmi_ioctl(struct fil
 		return ipmi_ioctl(filep, cmd, arg);
 	}
 }
+
+static long unlocked_compat_ipmi_ioctl(struct file *filep, unsigned int cmd,
+				       unsigned long arg)
+{
+	int ret;
+
+	mutex_lock(&ipmi_mutex);
+	ret = compat_ipmi_ioctl(filep, cmd, arg);
+	mutex_unlock(&ipmi_mutex);
+
+	return ret;
+}
 #endif
 
 static const struct file_operations ipmi_fops = {
 	.owner		= THIS_MODULE,
 	.unlocked_ioctl	= ipmi_unlocked_ioctl,
 #ifdef CONFIG_COMPAT
-	.compat_ioctl   = compat_ipmi_ioctl,
+	.compat_ioctl   = unlocked_compat_ipmi_ioctl,
 #endif
 	.open		= ipmi_open,
 	.release	= ipmi_release,
diff -druNp linux-libre-3.0.78-gnu1/drivers/dma/pch_dma.c linux-libre-3.0.79-gnu1/drivers/dma/pch_dma.c
--- linux-libre-3.0.78-gnu1/drivers/dma/pch_dma.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/dma/pch_dma.c	2013-05-19 13:05:47.000000000 -0400
@@ -489,7 +489,7 @@ static struct pch_dma_desc *pdc_desc_get
 	dev_dbg(chan2dev(&pd_chan->chan), "scanned %d descriptors\n", i);
 
 	if (!ret) {
-		ret = pdc_alloc_desc(&pd_chan->chan, GFP_NOIO);
+		ret = pdc_alloc_desc(&pd_chan->chan, GFP_ATOMIC);
 		if (ret) {
 			spin_lock(&pd_chan->lock);
 			pd_chan->descs_allocated++;
diff -druNp linux-libre-3.0.78-gnu1/drivers/gpu/drm/drm_mm.c linux-libre-3.0.79-gnu1/drivers/gpu/drm/drm_mm.c
--- linux-libre-3.0.78-gnu1/drivers/gpu/drm/drm_mm.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/gpu/drm/drm_mm.c	2013-05-19 13:05:47.000000000 -0400
@@ -679,33 +679,35 @@ void drm_mm_debug_table(struct drm_mm *m
 EXPORT_SYMBOL(drm_mm_debug_table);
 
 #if defined(CONFIG_DEBUG_FS)
-int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm)
+static unsigned long drm_mm_dump_hole(struct seq_file *m, struct drm_mm_node *entry)
 {
-	struct drm_mm_node *entry;
-	unsigned long total_used = 0, total_free = 0, total = 0;
 	unsigned long hole_start, hole_end, hole_size;
 
-	hole_start = drm_mm_hole_node_start(&mm->head_node);
-	hole_end = drm_mm_hole_node_end(&mm->head_node);
-	hole_size = hole_end - hole_start;
-	if (hole_size)
+	if (entry->hole_follows) {
+		hole_start = drm_mm_hole_node_start(entry);
+		hole_end = drm_mm_hole_node_end(entry);
+		hole_size = hole_end - hole_start;
 		seq_printf(m, "0x%08lx-0x%08lx: 0x%08lx: free\n",
 				hole_start, hole_end, hole_size);
-	total_free += hole_size;
+		return hole_size;
+	}
+
+	return 0;
+}
+
+int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm)
+{
+	struct drm_mm_node *entry;
+	unsigned long total_used = 0, total_free = 0, total = 0;
+
+	total_free += drm_mm_dump_hole(m, &mm->head_node);
 
 	drm_mm_for_each_node(entry, mm) {
 		seq_printf(m, "0x%08lx-0x%08lx: 0x%08lx: used\n",
 				entry->start, entry->start + entry->size,
 				entry->size);
 		total_used += entry->size;
-		if (entry->hole_follows) {
-			hole_start = drm_mm_hole_node_start(entry);
-			hole_end = drm_mm_hole_node_end(entry);
-			hole_size = hole_end - hole_start;
-			seq_printf(m, "0x%08lx-0x%08lx: 0x%08lx: free\n",
-					hole_start, hole_end, hole_size);
-			total_free += hole_size;
-		}
+		total_free += drm_mm_dump_hole(m, entry);
 	}
 	total = total_free + total_used;
 
diff -druNp linux-libre-3.0.78-gnu1/drivers/gpu/drm/radeon/r300_cmdbuf.c linux-libre-3.0.79-gnu1/drivers/gpu/drm/radeon/r300_cmdbuf.c
--- linux-libre-3.0.78-gnu1/drivers/gpu/drm/radeon/r300_cmdbuf.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/gpu/drm/radeon/r300_cmdbuf.c	2013-05-19 13:05:47.000000000 -0400
@@ -74,7 +74,7 @@ static int r300_emit_cliprects(drm_radeo
 		OUT_RING(CP_PACKET0(R300_RE_CLIPRECT_TL_0, nr * 2 - 1));
 
 		for (i = 0; i < nr; ++i) {
-			if (DRM_COPY_FROM_USER_UNCHECKED
+			if (DRM_COPY_FROM_USER
 			    (&box, &cmdbuf->boxes[n + i], sizeof(box))) {
 				DRM_ERROR("copy cliprect faulted\n");
 				return -EFAULT;
diff -druNp linux-libre-3.0.78-gnu1/drivers/md/dm-snap.c linux-libre-3.0.79-gnu1/drivers/md/dm-snap.c
--- linux-libre-3.0.78-gnu1/drivers/md/dm-snap.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/md/dm-snap.c	2013-05-19 13:05:47.000000000 -0400
@@ -1121,6 +1121,7 @@ static int snapshot_ctr(struct dm_target
 	s->pending_pool = mempool_create_slab_pool(MIN_IOS, pending_cache);
 	if (!s->pending_pool) {
 		ti->error = "Could not allocate mempool for pending exceptions";
+		r = -ENOMEM;
 		goto bad_pending_pool;
 	}
 
diff -druNp linux-libre-3.0.78-gnu1/drivers/net/3c509.c linux-libre-3.0.79-gnu1/drivers/net/3c509.c
--- linux-libre-3.0.78-gnu1/drivers/net/3c509.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/net/3c509.c	2013-05-19 13:05:47.000000000 -0400
@@ -309,6 +309,7 @@ static int __devinit el3_isa_match(struc
 	if (!dev)
 		return -ENOMEM;
 
+	SET_NETDEV_DEV(dev, pdev);
 	netdev_boot_setup_check(dev);
 
 	if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509-isa")) {
@@ -704,6 +705,7 @@ static int __init el3_eisa_probe (struct
 		return -ENOMEM;
 	}
 
+	SET_NETDEV_DEV(dev, device);
 	netdev_boot_setup_check(dev);
 
 	el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_EISA);
diff -druNp linux-libre-3.0.78-gnu1/drivers/net/3c59x.c linux-libre-3.0.79-gnu1/drivers/net/3c59x.c
--- linux-libre-3.0.78-gnu1/drivers/net/3c59x.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/net/3c59x.c	2013-05-19 13:05:47.000000000 -0400
@@ -632,7 +632,6 @@ struct vortex_private {
 		pm_state_valid:1,				/* pci_dev->saved_config_space has sane contents */
 		open:1,
 		medialock:1,
-		must_free_region:1,				/* Flag: if zero, Cardbus owns the I/O region */
 		large_frames:1,			/* accept large frames */
 		handling_irq:1;			/* private in_irq indicator */
 	/* {get|set}_wol operations are already serialized by rtnl.
@@ -951,7 +950,7 @@ static int __devexit vortex_eisa_remove(
 
 	unregister_netdev(dev);
 	iowrite16(TotalReset|0x14, ioaddr + EL3_CMD);
-	release_region(dev->base_addr, VORTEX_TOTAL_SIZE);
+	release_region(edev->base_addr, VORTEX_TOTAL_SIZE);
 
 	free_netdev(dev);
 	return 0;
@@ -1012,6 +1011,12 @@ static int __devinit vortex_init_one(str
 	if (rc < 0)
 		goto out;
 
+	rc = pci_request_regions(pdev, DRV_NAME);
+	if (rc < 0) {
+		pci_disable_device(pdev);
+		goto out;
+	}
+
 	unit = vortex_cards_found;
 
 	if (global_use_mmio < 0 && (unit >= MAX_UNITS || use_mmio[unit] < 0)) {
@@ -1027,6 +1032,7 @@ static int __devinit vortex_init_one(str
 	if (!ioaddr) /* If mapping fails, fall-back to BAR 0... */
 		ioaddr = pci_iomap(pdev, 0, 0);
 	if (!ioaddr) {
+		pci_release_regions(pdev);
 		pci_disable_device(pdev);
 		rc = -ENOMEM;
 		goto out;
@@ -1036,6 +1042,7 @@ static int __devinit vortex_init_one(str
 			   ent->driver_data, unit);
 	if (rc < 0) {
 		pci_iounmap(pdev, ioaddr);
+		pci_release_regions(pdev);
 		pci_disable_device(pdev);
 		goto out;
 	}
@@ -1180,11 +1187,6 @@ static int __devinit vortex_probe1(struc
 
 	/* PCI-only startup logic */
 	if (pdev) {
-		/* EISA resources already marked, so only PCI needs to do this here */
-		/* Ignore return value, because Cardbus drivers already allocate for us */
-		if (request_region(dev->base_addr, vci->io_size, print_name) != NULL)
-			vp->must_free_region = 1;
-
 		/* enable bus-mastering if necessary */
 		if (vci->flags & PCI_USES_MASTER)
 			pci_set_master(pdev);
@@ -1222,7 +1224,7 @@ static int __devinit vortex_probe1(struc
 					   &vp->rx_ring_dma);
 	retval = -ENOMEM;
 	if (!vp->rx_ring)
-		goto free_region;
+		goto free_device;
 
 	vp->tx_ring = (struct boom_tx_desc *)(vp->rx_ring + RX_RING_SIZE);
 	vp->tx_ring_dma = vp->rx_ring_dma + sizeof(struct boom_rx_desc) * RX_RING_SIZE;
@@ -1487,9 +1489,7 @@ free_ring:
 							+ sizeof(struct boom_tx_desc) * TX_RING_SIZE,
 						vp->rx_ring,
 						vp->rx_ring_dma);
-free_region:
-	if (vp->must_free_region)
-		release_region(dev->base_addr, vci->io_size);
+free_device:
 	free_netdev(dev);
 	pr_err(PFX "vortex_probe1 fails.  Returns %d\n", retval);
 out:
@@ -3253,8 +3253,9 @@ static void __devexit vortex_remove_one(
 							+ sizeof(struct boom_tx_desc) * TX_RING_SIZE,
 						vp->rx_ring,
 						vp->rx_ring_dma);
-	if (vp->must_free_region)
-		release_region(dev->base_addr, vp->io_size);
+
+	pci_release_regions(pdev);
+
 	free_netdev(dev);
 }
 
diff -druNp linux-libre-3.0.78-gnu1/drivers/net/macvlan.c linux-libre-3.0.79-gnu1/drivers/net/macvlan.c
--- linux-libre-3.0.78-gnu1/drivers/net/macvlan.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/net/macvlan.c	2013-05-19 13:05:47.000000000 -0400
@@ -193,7 +193,8 @@ static rx_handler_result_t macvlan_handl
 	}
 
 	if (port->passthru)
-		vlan = list_first_entry(&port->vlans, struct macvlan_dev, list);
+		vlan = list_first_or_null_rcu(&port->vlans,
+					      struct macvlan_dev, list);
 	else
 		vlan = macvlan_hash_lookup(port, eth->h_dest);
 	if (vlan == NULL)
@@ -687,7 +688,7 @@ int macvlan_common_newlink(struct net *s
 	if (err < 0)
 		goto destroy_port;
 
-	list_add_tail(&vlan->list, &port->vlans);
+	list_add_tail_rcu(&vlan->list, &port->vlans);
 	netif_stacked_transfer_operstate(lowerdev, dev);
 
 	return 0;
@@ -713,7 +714,7 @@ void macvlan_dellink(struct net_device *
 {
 	struct macvlan_dev *vlan = netdev_priv(dev);
 
-	list_del(&vlan->list);
+	list_del_rcu(&vlan->list);
 	unregister_netdevice_queue(dev, head);
 }
 EXPORT_SYMBOL_GPL(macvlan_dellink);
diff -druNp linux-libre-3.0.78-gnu1/drivers/net/r8169.c linux-libre-3.0.79-gnu1/drivers/net/r8169.c
--- linux-libre-3.0.78-gnu1/drivers/net/r8169.c	2013-05-11 21:44:28.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/net/r8169.c	2013-05-19 20:43:30.000000000 -0400
@@ -1490,8 +1490,6 @@ static void rtl8169_rx_vlan_tag(struct R
 
 	if (opts2 & RxVlanTag)
 		__vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff));
-
-	desc->opts2 = 0;
 }
 
 static int rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -5184,7 +5182,6 @@ static int rtl8169_rx_interrupt(struct n
 				rtl8169_schedule_work(dev, rtl8169_reset_task);
 				dev->stats.rx_fifo_errors++;
 			}
-			rtl8169_mark_to_asic(desc, rx_buf_sz);
 		} else {
 			struct sk_buff *skb;
 			dma_addr_t addr = le64_to_cpu(desc->addr);
@@ -5198,16 +5195,14 @@ static int rtl8169_rx_interrupt(struct n
 			if (unlikely(rtl8169_fragmented_frame(status))) {
 				dev->stats.rx_dropped++;
 				dev->stats.rx_length_errors++;
-				rtl8169_mark_to_asic(desc, rx_buf_sz);
-				continue;
+				goto release_descriptor;
 			}
 
 			skb = rtl8169_try_rx_copy(tp->Rx_databuff[entry],
 						  tp, pkt_size, addr);
-			rtl8169_mark_to_asic(desc, rx_buf_sz);
 			if (!skb) {
 				dev->stats.rx_dropped++;
-				continue;
+				goto release_descriptor;
 			}
 
 			rtl8169_rx_csum(skb, status);
@@ -5221,6 +5216,10 @@ static int rtl8169_rx_interrupt(struct n
 			dev->stats.rx_bytes += pkt_size;
 			dev->stats.rx_packets++;
 		}
+release_descriptor:
+		desc->opts2 = 0;
+		wmb();
+		rtl8169_mark_to_asic(desc, rx_buf_sz);
 	}
 
 	count = cur_rx - tp->cur_rx;
diff -druNp linux-libre-3.0.78-gnu1/drivers/net/wireless/ath/ath9k/main.c linux-libre-3.0.79-gnu1/drivers/net/wireless/ath/ath9k/main.c
--- linux-libre-3.0.78-gnu1/drivers/net/wireless/ath/ath9k/main.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/net/wireless/ath/ath9k/main.c	2013-05-19 13:05:47.000000000 -0400
@@ -1791,6 +1791,7 @@ static int ath9k_sta_add(struct ieee8021
 	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 	struct ath_node *an = (struct ath_node *) sta->drv_priv;
 	struct ieee80211_key_conf ps_key = { };
+	int key;
 
 	ath_node_attach(sc, sta);
 
@@ -1798,7 +1799,9 @@ static int ath9k_sta_add(struct ieee8021
 	    vif->type != NL80211_IFTYPE_AP_VLAN)
 		return 0;
 
-	an->ps_key = ath_key_config(common, vif, sta, &ps_key);
+	key = ath_key_config(common, vif, sta, &ps_key);
+	if (key > 0)
+		an->ps_key = key;
 
 	return 0;
 }
@@ -1815,6 +1818,7 @@ static void ath9k_del_ps_key(struct ath_
 	    return;
 
 	ath_key_delete(common, &ps_key);
+	an->ps_key = 0;
 }
 
 static int ath9k_sta_remove(struct ieee80211_hw *hw,
diff -druNp linux-libre-3.0.78-gnu1/drivers/net/wireless/mwifiex/cmdevt.c linux-libre-3.0.79-gnu1/drivers/net/wireless/mwifiex/cmdevt.c
--- linux-libre-3.0.78-gnu1/drivers/net/wireless/mwifiex/cmdevt.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/net/wireless/mwifiex/cmdevt.c	2013-05-19 13:05:47.000000000 -0400
@@ -1081,6 +1081,7 @@ mwifiex_process_hs_config(struct mwifiex
 	adapter->if_ops.wakeup(adapter);
 	adapter->hs_activated = false;
 	adapter->is_hs_configured = false;
+	adapter->is_suspended = false;
 	mwifiex_hs_activated_event(mwifiex_get_priv(adapter,
 				   MWIFIEX_BSS_ROLE_ANY), false);
 }
diff -druNp linux-libre-3.0.78-gnu1/drivers/net/wireless/mwifiex/sta_ioctl.c linux-libre-3.0.79-gnu1/drivers/net/wireless/mwifiex/sta_ioctl.c
--- linux-libre-3.0.78-gnu1/drivers/net/wireless/mwifiex/sta_ioctl.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/net/wireless/mwifiex/sta_ioctl.c	2013-05-19 13:05:47.000000000 -0400
@@ -100,7 +100,7 @@ int mwifiex_request_set_multicast_list(s
 	} else {
 		/* Multicast */
 		priv->curr_pkt_filter &= ~HostCmd_ACT_MAC_PROMISCUOUS_ENABLE;
-		if (mcast_list->mode == MWIFIEX_MULTICAST_MODE) {
+		if (mcast_list->mode == MWIFIEX_ALL_MULTI_MODE) {
 			dev_dbg(priv->adapter->dev,
 				"info: Enabling All Multicast!\n");
 			priv->curr_pkt_filter |=
@@ -112,20 +112,11 @@ int mwifiex_request_set_multicast_list(s
 				dev_dbg(priv->adapter->dev,
 					"info: Set multicast list=%d\n",
 				       mcast_list->num_multicast_addr);
-				/* Set multicast addresses to firmware */
-				if (old_pkt_filter == priv->curr_pkt_filter) {
-					/* Send request to firmware */
-					ret = mwifiex_send_cmd_async(priv,
-						HostCmd_CMD_MAC_MULTICAST_ADR,
-						HostCmd_ACT_GEN_SET, 0,
-						mcast_list);
-				} else {
-					/* Send request to firmware */
-					ret = mwifiex_send_cmd_async(priv,
-						HostCmd_CMD_MAC_MULTICAST_ADR,
-						HostCmd_ACT_GEN_SET, 0,
-						mcast_list);
-				}
+				/* Send multicast addresses to firmware */
+				ret = mwifiex_send_cmd_async(priv,
+					HostCmd_CMD_MAC_MULTICAST_ADR,
+					HostCmd_ACT_GEN_SET, 0,
+					mcast_list);
 			}
 		}
 	}
diff -druNp linux-libre-3.0.78-gnu1/drivers/rtc/rtc-pcf2123.c linux-libre-3.0.79-gnu1/drivers/rtc/rtc-pcf2123.c
--- linux-libre-3.0.78-gnu1/drivers/rtc/rtc-pcf2123.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/rtc/rtc-pcf2123.c	2013-05-19 13:05:47.000000000 -0400
@@ -263,6 +263,7 @@ static int __devinit pcf2123_probe(struc
 
 	if (!(rxbuf[0] & 0x20)) {
 		dev_err(&spi->dev, "chip not found\n");
+		ret = -ENODEV;
 		goto kfree_exit;
 	}
 
diff -druNp linux-libre-3.0.78-gnu1/drivers/scsi/sd.c linux-libre-3.0.79-gnu1/drivers/scsi/sd.c
--- linux-libre-3.0.78-gnu1/drivers/scsi/sd.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/scsi/sd.c	2013-05-19 13:05:47.000000000 -0400
@@ -138,6 +138,7 @@ sd_store_cache_type(struct device *dev,
 	char *buffer_data;
 	struct scsi_mode_data data;
 	struct scsi_sense_hdr sshdr;
+	const char *temp = "temporary ";
 	int len;
 
 	if (sdp->type != TYPE_DISK)
@@ -146,6 +147,13 @@ sd_store_cache_type(struct device *dev,
 		 * it's not worth the risk */
 		return -EINVAL;
 
+	if (strncmp(buf, temp, sizeof(temp) - 1) == 0) {
+		buf += sizeof(temp) - 1;
+		sdkp->cache_override = 1;
+	} else {
+		sdkp->cache_override = 0;
+	}
+
 	for (i = 0; i < ARRAY_SIZE(sd_cache_types); i++) {
 		len = strlen(sd_cache_types[i]);
 		if (strncmp(sd_cache_types[i], buf, len) == 0 &&
@@ -158,6 +166,13 @@ sd_store_cache_type(struct device *dev,
 		return -EINVAL;
 	rcd = ct & 0x01 ? 1 : 0;
 	wce = ct & 0x02 ? 1 : 0;
+
+	if (sdkp->cache_override) {
+		sdkp->WCE = wce;
+		sdkp->RCD = rcd;
+		return count;
+	}
+
 	if (scsi_mode_sense(sdp, 0x08, 8, buffer, sizeof(buffer), SD_TIMEOUT,
 			    SD_MAX_RETRIES, &data, NULL))
 		return -EINVAL;
@@ -2036,6 +2051,10 @@ sd_read_cache_type(struct scsi_disk *sdk
 	int old_rcd = sdkp->RCD;
 	int old_dpofua = sdkp->DPOFUA;
 
+
+	if (sdkp->cache_override)
+		return;
+
 	first_len = 4;
 	if (sdp->skip_ms_page_8) {
 		if (sdp->type == TYPE_RBC)
@@ -2517,6 +2536,7 @@ static void sd_probe_async(void *data, a
 	sdkp->capacity = 0;
 	sdkp->media_present = 1;
 	sdkp->write_prot = 0;
+	sdkp->cache_override = 0;
 	sdkp->WCE = 0;
 	sdkp->RCD = 0;
 	sdkp->ATO = 0;
diff -druNp linux-libre-3.0.78-gnu1/drivers/scsi/sd.h linux-libre-3.0.79-gnu1/drivers/scsi/sd.h
--- linux-libre-3.0.78-gnu1/drivers/scsi/sd.h	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/drivers/scsi/sd.h	2013-05-19 13:05:47.000000000 -0400
@@ -70,6 +70,7 @@ struct scsi_disk {
 	u8		protection_type;/* Data Integrity Field */
 	u8		provisioning_mode;
 	unsigned	ATO : 1;	/* state of disk ATO bit */
+	unsigned	cache_override : 1; /* temp override of WCE,RCD */
 	unsigned	WCE : 1;	/* state of disk WCE bit */
 	unsigned	RCD : 1;	/* state of disk RCD bit, unused */
 	unsigned	DPOFUA : 1;	/* state of disk DPOFUA bit */
diff -druNp linux-libre-3.0.78-gnu1/fs/ext4/mballoc.c linux-libre-3.0.79-gnu1/fs/ext4/mballoc.c
--- linux-libre-3.0.78-gnu1/fs/ext4/mballoc.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/fs/ext4/mballoc.c	2013-05-19 13:05:47.000000000 -0400
@@ -2026,7 +2026,11 @@ repeat:
 		group = ac->ac_g_ex.fe_group;
 
 		for (i = 0; i < ngroups; group++, i++) {
-			if (group == ngroups)
+			/*
+			 * Artificially restricted ngroups for non-extent
+			 * files makes group > ngroups possible on first loop.
+			 */
+			if (group >= ngroups)
 				group = 0;
 
 			/* This now checks without needing the buddy page */
diff -druNp linux-libre-3.0.78-gnu1/include/linux/if_cablemodem.h linux-libre-3.0.79-gnu1/include/linux/if_cablemodem.h
--- linux-libre-3.0.78-gnu1/include/linux/if_cablemodem.h	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/include/linux/if_cablemodem.h	2013-05-19 13:05:47.000000000 -0400
@@ -12,11 +12,11 @@
  */
 
 /* some useful defines for sb1000.c e cmconfig.c - fv */
-#define SIOCGCMSTATS		SIOCDEVPRIVATE+0	/* get cable modem stats */
-#define SIOCGCMFIRMWARE		SIOCDEVPRIVATE+1	/* get cm firmware version */
-#define SIOCGCMFREQUENCY	SIOCDEVPRIVATE+2	/* get cable modem frequency */
-#define SIOCSCMFREQUENCY	SIOCDEVPRIVATE+3	/* set cable modem frequency */
-#define SIOCGCMPIDS			SIOCDEVPRIVATE+4	/* get cable modem PIDs */
-#define SIOCSCMPIDS			SIOCDEVPRIVATE+5	/* set cable modem PIDs */
+#define SIOCGCMSTATS		(SIOCDEVPRIVATE+0)	/* get cable modem stats */
+#define SIOCGCMFIRMWARE		(SIOCDEVPRIVATE+1)	/* get cm firmware version */
+#define SIOCGCMFREQUENCY	(SIOCDEVPRIVATE+2)	/* get cable modem frequency */
+#define SIOCSCMFREQUENCY	(SIOCDEVPRIVATE+3)	/* set cable modem frequency */
+#define SIOCGCMPIDS			(SIOCDEVPRIVATE+4)	/* get cable modem PIDs */
+#define SIOCSCMPIDS			(SIOCDEVPRIVATE+5)	/* set cable modem PIDs */
 
 #endif
diff -druNp linux-libre-3.0.78-gnu1/include/linux/rculist.h linux-libre-3.0.79-gnu1/include/linux/rculist.h
--- linux-libre-3.0.78-gnu1/include/linux/rculist.h	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/include/linux/rculist.h	2013-05-19 13:05:47.000000000 -0400
@@ -242,6 +242,23 @@ static inline void list_splice_init_rcu(
 	list_entry_rcu((ptr)->next, type, member)
 
 /**
+ * list_first_or_null_rcu - get the first element from a list
+ * @ptr:        the list head to take the element from.
+ * @type:       the type of the struct this is embedded in.
+ * @member:     the name of the list_struct within the struct.
+ *
+ * Note that if the list is empty, it returns NULL.
+ *
+ * This primitive may safely run concurrently with the _rcu list-mutation
+ * primitives such as list_add_rcu() as long as it's guarded by rcu_read_lock().
+ */
+#define list_first_or_null_rcu(ptr, type, member) \
+	({struct list_head *__ptr = (ptr); \
+	  struct list_head __rcu *__next = list_next_rcu(__ptr); \
+	  likely(__ptr != __next) ? container_of(__next, type, member) : NULL; \
+	})
+
+/**
  * list_for_each_entry_rcu	-	iterate over rcu list of given type
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
diff -druNp linux-libre-3.0.78-gnu1/include/net/sock.h linux-libre-3.0.79-gnu1/include/net/sock.h
--- linux-libre-3.0.78-gnu1/include/net/sock.h	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/include/net/sock.h	2013-05-19 13:05:47.000000000 -0400
@@ -721,6 +721,18 @@ struct timewait_sock_ops;
 struct inet_hashinfo;
 struct raw_hashinfo;
 
+/*
+ * caches using SLAB_DESTROY_BY_RCU should let .next pointer from nulls nodes
+ * un-modified. Special care is taken when initializing object to zero.
+ */
+static inline void sk_prot_clear_nulls(struct sock *sk, int size)
+{
+	if (offsetof(struct sock, sk_node.next) != 0)
+		memset(sk, 0, offsetof(struct sock, sk_node.next));
+	memset(&sk->sk_node.pprev, 0,
+	       size - offsetof(struct sock, sk_node.pprev));
+}
+
 /* Networking protocol blocks we attach to sockets.
  * socket layer -> transport layer interface
  * transport -> network interface is defined by struct inet_proto
diff -druNp linux-libre-3.0.78-gnu1/include/net/tcp.h linux-libre-3.0.79-gnu1/include/net/tcp.h
--- linux-libre-3.0.78-gnu1/include/net/tcp.h	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/include/net/tcp.h	2013-05-19 13:05:47.000000000 -0400
@@ -902,6 +902,7 @@ static inline int tcp_prequeue(struct so
 	if (sysctl_tcp_low_latency || !tp->ucopy.task)
 		return 0;
 
+	skb_dst_force(skb);
 	__skb_queue_tail(&tp->ucopy.prequeue, skb);
 	tp->ucopy.memory += skb->truesize;
 	if (tp->ucopy.memory > sk->sk_rcvbuf) {
diff -druNp linux-libre-3.0.78-gnu1/kernel/kmod.c linux-libre-3.0.79-gnu1/kernel/kmod.c
--- linux-libre-3.0.78-gnu1/kernel/kmod.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/kernel/kmod.c	2013-05-19 13:05:47.000000000 -0400
@@ -421,6 +421,11 @@ int call_usermodehelper_exec(struct subp
 	int retval = 0;
 
 	helper_lock();
+	if (!sub_info->path) {
+		retval = -EINVAL;
+		goto out;
+	}
+
 	if (sub_info->path[0] == '\0')
 		goto out;
 
diff -druNp linux-libre-3.0.78-gnu1/kernel/time/tick-sched.c linux-libre-3.0.79-gnu1/kernel/time/tick-sched.c
--- linux-libre-3.0.78-gnu1/kernel/time/tick-sched.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/kernel/time/tick-sched.c	2013-05-19 13:05:47.000000000 -0400
@@ -811,7 +811,7 @@ void tick_cancel_sched_timer(int cpu)
 		hrtimer_cancel(&ts->sched_timer);
 # endif
 
-	ts->nohz_mode = NOHZ_MODE_INACTIVE;
+	memset(ts, 0, sizeof(*ts));
 }
 #endif
 
diff -druNp linux-libre-3.0.78-gnu1/kernel/timer.c linux-libre-3.0.79-gnu1/kernel/timer.c
--- linux-libre-3.0.78-gnu1/kernel/timer.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/kernel/timer.c	2013-05-19 13:05:47.000000000 -0400
@@ -1630,12 +1630,12 @@ static int __cpuinit init_timers_cpu(int
 			boot_done = 1;
 			base = &boot_tvec_bases;
 		}
+		spin_lock_init(&base->lock);
 		tvec_base_done[cpu] = 1;
 	} else {
 		base = per_cpu(tvec_bases, cpu);
 	}
 
-	spin_lock_init(&base->lock);
 
 	for (j = 0; j < TVN_SIZE; j++) {
 		INIT_LIST_HEAD(base->tv5.vec + j);
diff -druNp linux-libre-3.0.78-gnu1/Makefile linux-libre-3.0.79-gnu1/Makefile
--- linux-libre-3.0.78-gnu1/Makefile	2013-05-11 21:39:35.000000000 -0400
+++ linux-libre-3.0.79-gnu1/Makefile	2013-05-19 20:38:48.000000000 -0400
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 0
-SUBLEVEL = 78
+SUBLEVEL = 79
 EXTRAVERSION =-gnu1
 NAME = Sneaky Weasel
 
diff -druNp linux-libre-3.0.78-gnu1/net/bridge/br_stp_timer.c linux-libre-3.0.79-gnu1/net/bridge/br_stp_timer.c
--- linux-libre-3.0.78-gnu1/net/bridge/br_stp_timer.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/net/bridge/br_stp_timer.c	2013-05-19 13:05:47.000000000 -0400
@@ -106,7 +106,7 @@ static void br_tcn_timer_expired(unsigne
 
 	br_debug(br, "tcn timer expired\n");
 	spin_lock(&br->lock);
-	if (br->dev->flags & IFF_UP) {
+	if (!br_is_root_bridge(br) && (br->dev->flags & IFF_UP)) {
 		br_transmit_tcn(br);
 
 		mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time);
diff -druNp linux-libre-3.0.78-gnu1/net/core/sock.c linux-libre-3.0.79-gnu1/net/core/sock.c
--- linux-libre-3.0.78-gnu1/net/core/sock.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/net/core/sock.c	2013-05-19 13:05:47.000000000 -0400
@@ -1017,18 +1017,6 @@ static void sock_copy(struct sock *nsk,
 #endif
 }
 
-/*
- * caches using SLAB_DESTROY_BY_RCU should let .next pointer from nulls nodes
- * un-modified. Special care is taken when initializing object to zero.
- */
-static inline void sk_prot_clear_nulls(struct sock *sk, int size)
-{
-	if (offsetof(struct sock, sk_node.next) != 0)
-		memset(sk, 0, offsetof(struct sock, sk_node.next));
-	memset(&sk->sk_node.pprev, 0,
-	       size - offsetof(struct sock, sk_node.pprev));
-}
-
 void sk_prot_clear_portaddr_nulls(struct sock *sk, int size)
 {
 	unsigned long nulls1, nulls2;
diff -druNp linux-libre-3.0.78-gnu1/net/ipv6/tcp_ipv6.c linux-libre-3.0.79-gnu1/net/ipv6/tcp_ipv6.c
--- linux-libre-3.0.78-gnu1/net/ipv6/tcp_ipv6.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/net/ipv6/tcp_ipv6.c	2013-05-19 13:05:47.000000000 -0400
@@ -2205,6 +2205,17 @@ void tcp6_proc_exit(struct net *net)
 }
 #endif
 
+static void tcp_v6_clear_sk(struct sock *sk, int size)
+{
+	struct inet_sock *inet = inet_sk(sk);
+
+	/* we do not want to clear pinet6 field, because of RCU lookups */
+	sk_prot_clear_nulls(sk, offsetof(struct inet_sock, pinet6));
+
+	size -= offsetof(struct inet_sock, pinet6) + sizeof(inet->pinet6);
+	memset(&inet->pinet6 + 1, 0, size);
+}
+
 struct proto tcpv6_prot = {
 	.name			= "TCPv6",
 	.owner			= THIS_MODULE,
@@ -2244,6 +2255,7 @@ struct proto tcpv6_prot = {
 	.compat_setsockopt	= compat_tcp_setsockopt,
 	.compat_getsockopt	= compat_tcp_getsockopt,
 #endif
+	.clear_sk		= tcp_v6_clear_sk,
 };
 
 static const struct inet6_protocol tcpv6_protocol = {
diff -druNp linux-libre-3.0.78-gnu1/net/ipv6/udp.c linux-libre-3.0.79-gnu1/net/ipv6/udp.c
--- linux-libre-3.0.78-gnu1/net/ipv6/udp.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/net/ipv6/udp.c	2013-05-19 13:05:47.000000000 -0400
@@ -1448,6 +1448,17 @@ void udp6_proc_exit(struct net *net) {
 }
 #endif /* CONFIG_PROC_FS */
 
+void udp_v6_clear_sk(struct sock *sk, int size)
+{
+	struct inet_sock *inet = inet_sk(sk);
+
+	/* we do not want to clear pinet6 field, because of RCU lookups */
+	sk_prot_clear_portaddr_nulls(sk, offsetof(struct inet_sock, pinet6));
+
+	size -= offsetof(struct inet_sock, pinet6) + sizeof(inet->pinet6);
+	memset(&inet->pinet6 + 1, 0, size);
+}
+
 /* ------------------------------------------------------------------------ */
 
 struct proto udpv6_prot = {
@@ -1478,7 +1489,7 @@ struct proto udpv6_prot = {
 	.compat_setsockopt = compat_udpv6_setsockopt,
 	.compat_getsockopt = compat_udpv6_getsockopt,
 #endif
-	.clear_sk	   = sk_prot_clear_portaddr_nulls,
+	.clear_sk	   = udp_v6_clear_sk,
 };
 
 static struct inet_protosw udpv6_protosw = {
diff -druNp linux-libre-3.0.78-gnu1/net/ipv6/udp_impl.h linux-libre-3.0.79-gnu1/net/ipv6/udp_impl.h
--- linux-libre-3.0.78-gnu1/net/ipv6/udp_impl.h	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/net/ipv6/udp_impl.h	2013-05-19 13:05:47.000000000 -0400
@@ -31,6 +31,8 @@ extern int	udpv6_recvmsg(struct kiocb *i
 extern int	udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb);
 extern void	udpv6_destroy_sock(struct sock *sk);
 
+extern void udp_v6_clear_sk(struct sock *sk, int size);
+
 #ifdef CONFIG_PROC_FS
 extern int	udp6_seq_show(struct seq_file *seq, void *v);
 #endif
diff -druNp linux-libre-3.0.78-gnu1/net/ipv6/udplite.c linux-libre-3.0.79-gnu1/net/ipv6/udplite.c
--- linux-libre-3.0.78-gnu1/net/ipv6/udplite.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/net/ipv6/udplite.c	2013-05-19 13:05:47.000000000 -0400
@@ -55,7 +55,7 @@ struct proto udplitev6_prot = {
 	.compat_setsockopt = compat_udpv6_setsockopt,
 	.compat_getsockopt = compat_udpv6_getsockopt,
 #endif
-	.clear_sk	   = sk_prot_clear_portaddr_nulls,
+	.clear_sk	   = udp_v6_clear_sk,
 };
 
 static struct inet_protosw udplite6_protosw = {
diff -druNp linux-libre-3.0.78-gnu1/net/ipv6/xfrm6_policy.c linux-libre-3.0.79-gnu1/net/ipv6/xfrm6_policy.c
--- linux-libre-3.0.78-gnu1/net/ipv6/xfrm6_policy.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/net/ipv6/xfrm6_policy.c	2013-05-19 13:05:47.000000000 -0400
@@ -96,8 +96,10 @@ static int xfrm6_fill_dst(struct xfrm_ds
 	dev_hold(dev);
 
 	xdst->u.rt6.rt6i_idev = in6_dev_get(dev);
-	if (!xdst->u.rt6.rt6i_idev)
+	if (!xdst->u.rt6.rt6i_idev) {
+		dev_put(dev);
 		return -ENODEV;
+	}
 
 	xdst->u.rt6.rt6i_peer = rt->rt6i_peer;
 	if (rt->rt6i_peer)
diff -druNp linux-libre-3.0.78-gnu1/net/sched/act_ipt.c linux-libre-3.0.79-gnu1/net/sched/act_ipt.c
--- linux-libre-3.0.78-gnu1/net/sched/act_ipt.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/net/sched/act_ipt.c	2013-05-19 13:05:47.000000000 -0400
@@ -8,7 +8,7 @@
  *		as published by the Free Software Foundation; either version
  *		2 of the License, or (at your option) any later version.
  *
- * Copyright:	Jamal Hadi Salim (2002-4)
+ * Copyright:	Jamal Hadi Salim (2002-13)
  */
 
 #include <linux/types.h>
@@ -299,17 +299,44 @@ static struct tc_action_ops act_ipt_ops
 	.walk		=	tcf_generic_walker
 };
 
-MODULE_AUTHOR("Jamal Hadi Salim(2002-4)");
+static struct tc_action_ops act_xt_ops = {
+	.kind		=	"xt",
+	.hinfo		=	&ipt_hash_info,
+	.type		=	TCA_ACT_IPT,
+	.capab		=	TCA_CAP_NONE,
+	.owner		=	THIS_MODULE,
+	.act		=	tcf_ipt,
+	.dump		=	tcf_ipt_dump,
+	.cleanup	=	tcf_ipt_cleanup,
+	.lookup		=	tcf_hash_search,
+	.init		=	tcf_ipt_init,
+	.walk		=	tcf_generic_walker
+};
+
+MODULE_AUTHOR("Jamal Hadi Salim(2002-13)");
 MODULE_DESCRIPTION("Iptables target actions");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("act_xt");
 
 static int __init ipt_init_module(void)
 {
-	return tcf_register_action(&act_ipt_ops);
+	int ret1, ret2;
+	ret1 = tcf_register_action(&act_xt_ops);
+	if (ret1 < 0)
+		printk("Failed to load xt action\n");
+	ret2 = tcf_register_action(&act_ipt_ops);
+	if (ret2 < 0)
+		printk("Failed to load ipt action\n");
+
+	if (ret1 < 0 && ret2 < 0)
+		return ret1;
+	else
+		return 0;
 }
 
 static void __exit ipt_cleanup_module(void)
 {
+	tcf_unregister_action(&act_xt_ops);
 	tcf_unregister_action(&act_ipt_ops);
 }
 
diff -druNp linux-libre-3.0.78-gnu1/sound/soc/codecs/wm8994.c linux-libre-3.0.79-gnu1/sound/soc/codecs/wm8994.c
--- linux-libre-3.0.78-gnu1/sound/soc/codecs/wm8994.c	2013-05-11 16:38:25.000000000 -0400
+++ linux-libre-3.0.79-gnu1/sound/soc/codecs/wm8994.c	2013-05-19 13:05:47.000000000 -0400
@@ -2249,6 +2249,7 @@ static int wm8994_aif3_hw_params(struct
 		default:
 			return 0;
 		}
+		break;
 	default:
 		return 0;
 	}
