Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 3 insertions, 6 deletions

diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c
index 6776d1c12b63..7e267c9379bc 100644
--- a/sound/aoa/core/gpio-pmf.c
+++ b/sound/aoa/core/gpio-pmf.c
@@ -116,12 +116,9 @@ static void pmf_gpio_exit(struct gpio_runtime *rt)
         mutex_destroy(&rt->line_in_notify.mutex);
         mutex_destroy(&rt->line_out_notify.mutex);
 
-        if (rt->headphone_notify.gpio_private)
-                kfree(rt->headphone_notify.gpio_private);
-        if (rt->line_in_notify.gpio_private)
-                kfree(rt->line_in_notify.gpio_private);
-        if (rt->line_out_notify.gpio_private)
-                kfree(rt->line_out_notify.gpio_private);
+        kfree(rt->headphone_notify.gpio_private);
+        kfree(rt->line_in_notify.gpio_private);
+        kfree(rt->line_out_notify.gpio_private);
 }
 
 static void pmf_handle_notify_irq(void *data)