Merge remote-tracking branch 'random/dev'

Conflicts:
	drivers/char/random.c

diff --cc drivers/char/random.c
index 7a744d39175638a381835a8cadce7039f58ee3bf,f126bd2f69fe4563308d4e838cb4650f422c6695..7cfc146bf7ba44452994d055af2afac65515ec9e
--- 1/drivers/char/random.c
--- 2/drivers/char/random.c
+++ b/drivers/char/random.c
@@@ -255,8 -255,12 +255,9 @@@
  #include <linux/fips.h>
  #include <linux/ptrace.h>
  #include <linux/kmemcheck.h>
 +#include <linux/irq.h>
+ #include <linux/workqueue.h>
  
 -#ifdef CONFIG_GENERIC_HARDIRQS
 -# include <linux/irq.h>
 -#endif
 -
  #include <asm/processor.h>
  #include <asm/uaccess.h>
  #include <asm/irq.h>