Merge branch 'master' into upstream

Conflicts:

	net/ieee80211/ieee80211_crypt_tkip.c
	net/ieee80211/ieee80211_crypt_wep.c

1 files changed, 2 insertions, 2 deletions

diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h
index dc9bd101ca14..4b51d42e1419 100644
--- a/include/asm-powerpc/vio.h
+++ b/include/asm-powerpc/vio.h
@@ -46,8 +46,8 @@ struct iommu_table;
  */
 struct vio_dev {
         struct iommu_table *iommu_table;     /* vio_map_* uses this */
-        char *name;
-        char *type;
+        const char *name;
+        const char *type;
         uint32_t unit_address;
         unsigned int irq;
         struct device dev;