diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /lib/timerqueue.c | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/timerqueue.c')
| -rw-r--r-- | lib/timerqueue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/timerqueue.c b/lib/timerqueue.c index 191176a43e9a..a382e4a32609 100644 --- a/lib/timerqueue.c +++ b/lib/timerqueue.c | |||
| @@ -22,9 +22,10 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/bug.h> | ||
| 25 | #include <linux/timerqueue.h> | 26 | #include <linux/timerqueue.h> |
| 26 | #include <linux/rbtree.h> | 27 | #include <linux/rbtree.h> |
| 27 | #include <linux/module.h> | 28 | #include <linux/export.h> |
| 28 | 29 | ||
| 29 | /** | 30 | /** |
| 30 | * timerqueue_add - Adds timer to timerqueue. | 31 | * timerqueue_add - Adds timer to timerqueue. |