Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index 457710615261..a548c1d28fa8 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -217,11 +217,11 @@ struct ubi_volume {
         void *upd_buf;
 
         int *eba_tbl;
-        int checked:1;
-        int corrupted:1;
-        int upd_marker:1;
-        int updating:1;
-        int changing_leb:1;
+        unsigned int checked:1;
+        unsigned int corrupted:1;
+        unsigned int upd_marker:1;
+        unsigned int updating:1;
+        unsigned int changing_leb:1;
 
 #ifdef CONFIG_MTD_UBI_GLUEBI
         /*