Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on a .30-rc1 base and was missing out on
              on a handful of tracing fixes present in .30-rc5-almost.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index 6ce5d2598a09..adf5f273868a 100644
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -1183,8 +1183,7 @@ out_free_txq:
         free_queue(lp->tx_num_entries, lp->tx_base);
 
 out_free_mssbuf:
-        if (mssbuf)
-                kfree(mssbuf);
+        kfree(mssbuf);
 
 out_free_iommu:
         ldc_iommu_release(lp);
@@ -1217,8 +1216,7 @@ void ldc_free(struct ldc_channel *lp)
 
         hlist_del(&lp->list);
 
-        if (lp->mssbuf)
-                kfree(lp->mssbuf);
+        kfree(lp->mssbuf);
 
         ldc_iommu_release(lp);