From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 May 2009 17:11:06 +0000 (-0700)
Subject: Merge branches 'sched-fixes-for-linus-2' and 'core-fixes-for-linus-2' of git://git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ee3af6ee77f61cac3c8f770c65736bf5ed03a697;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branches 'sched-fixes-for-linus-2' and 'core-fixes-for-linus-2' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Fix fallback sched_clock()'s offset when using jiffies

* 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS
---

ee3af6ee77f61cac3c8f770c65736bf5ed03a697