Merge branch 'master' into for-next

Conflicts:
	arch/arm/mach-omap1/board-nokia770.c

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 2ed3f82e5c30..e021ec663ef9 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -627,7 +627,7 @@ out_iucv:
 static void __exit mon_exit(void)
 {
         segment_unload(mon_dcss_name);
-        WARN_ON(misc_deregister(&mon_dev) != 0);
+        misc_deregister(&mon_dev);
         device_unregister(monreader_device);
         driver_unregister(&monreader_driver);
         iucv_unregister(&monreader_iucv_handler, 1);
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 98a49dfda1de..572a1e7fd099 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -380,7 +380,7 @@ out_driver:
 
 static void __exit mon_exit(void)
 {
-        WARN_ON(misc_deregister(&mon_dev) != 0);
+        misc_deregister(&mon_dev);
         platform_device_unregister(monwriter_pdev);
         platform_driver_unregister(&monwriter_pdrv);
 }