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, 1 insertions, 1 deletions

diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c
index d66933d70fb9..9b796cae4afe 100644
--- a/drivers/net/wireless/prism54/oid_mgt.c
+++ b/drivers/net/wireless/prism54/oid_mgt.c
@@ -820,7 +820,7 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str)
                         k = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", list->nr);
                         for (i = 0; i < list->nr; i++)
                                 k += snprintf(str + k, PRIV_STR_SIZE - k,
-                                              "bss[%u] : \nage=%u\nchannel=%u\n"
+                                              "bss[%u] :\nage=%u\nchannel=%u\n"
                                               "capinfo=0x%X\nrates=0x%X\n"
                                               "basic_rates=0x%X\n",
                                               i, list->bsslist[i].age,