Merge branch 'timers/urgent' into timers/core (e8b9dd7e) · Commits · android / goshawk_kernel_oplus_sdm710

Commit e8b9dd7e authored Jul 15, 2012 by Thomas Gleixner

Merge branch 'timers/urgent' into timers/core



Reason: Update to upstream changes to avoid further conflicts.
Fixup a trivial merge conflict in kernel/time/tick-sched.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parents 924412f6 6b1859db

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment