Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux...

diff --cc drivers/char/pcmcia/synclink_cs.c
Simple merge

diff --cc drivers/char/synclink.c
Simple merge

diff --cc drivers/char/synclink_gt.c
Simple merge

diff --cc drivers/char/synclinkmp.c
Simple merge

diff --cc drivers/net/wan/Kconfig
Simple merge

diff --cc drivers/net/wan/cosa.c
index f7d3349dc3ec8ffcc35707287e4a3127176d9fd5,e38b7acc52dbe9aad555af53cbc13cf188f4c32b..f14051556c87d08098108f2f695a5bc2c6d35f5a
--- 1/drivers/net/wan/cosa.c
--- 2/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@@ -397,12 -387,12 +387,12 @@@ static int __init cosa_init(void
                err = PTR_ERR(cosa_class);
                goto out_chrdev;
        }
 -      for (i=0; i<nr_cards; i++) {
 -              device_create(cosa_class, NULL, MKDEV(cosa_major, i), "cosa%d", i);
 -      }
 +      for (i = 0; i < nr_cards; i++)
 +              device_create_drvdata(cosa_class, NULL, MKDEV(cosa_major, i),
 +                                    NULL, "cosa%d", i);
        err = 0;
        goto out;
-       
+ 
  out_chrdev:
        unregister_chrdev(cosa_major, "cosa");
  out: