diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-11-21 14:31:52 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-11-21 14:31:52 -0500 |
| commit | 9c3f9e281697d02889c3b08922f3b30be75f56c2 (patch) | |
| tree | e9f3d68e0019a47b982e2b8644f70eb66a3eff3c /mm/huge_memory.c | |
| parent | b8f61116c1ce342804a0897b0a80eb4df5f19453 (diff) | |
| parent | d6ad418763888f617ac5b4849823e4cd670df1dd (diff) | |
Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Fix trivial conflicts in: kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'mm/huge_memory.c')
0 files changed, 0 insertions, 0 deletions