Merge branch 'linus' into x86/cleanups

Conflicts:
	arch/x86/kernel/reboot.c

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/uwb/umc.h b/include/linux/uwb/umc.h
index 36a39e34f8d7..4b4fc0f43855 100644
--- a/include/linux/uwb/umc.h
+++ b/include/linux/uwb/umc.h
@@ -89,6 +89,8 @@ struct umc_driver {
         void (*remove)(struct umc_dev *);
         int  (*suspend)(struct umc_dev *, pm_message_t state);
         int  (*resume)(struct umc_dev *);
+        int  (*pre_reset)(struct umc_dev *);
+        int  (*post_reset)(struct umc_dev *);
 
         struct device_driver driver;
 };