From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jul 2012 17:36:02 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.5~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6f7024285864290259d6b4c36f9e84a4b89ec3c4;p=~emulex%2Finfiniband.git

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

One more time/ntp fix pulled from Ingo Molnar.

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ntp: Fix STA_INS/DEL clearing bug
---

6f7024285864290259d6b4c36f9e84a4b89ec3c4