From: Thierry Reding <treding@nvidia.com>
Date: Thu, 24 Oct 2013 13:02:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'random/dev'
X-Git-Tag: next-20131024~13
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=b244a176be746a8f20b7d2321c48dda3710049f6

Merge remote-tracking branch 'random/dev'

Conflicts:
	drivers/char/random.c
---

b244a176be746a8f20b7d2321c48dda3710049f6
diff --cc drivers/char/random.c
index 7a744d391756,f126bd2f69fe..7cfc146bf7ba
--- a/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>