From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Jun 2009 17:06:19 +0000 (-0700)
Subject: Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v2.6.31-rc1~326
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19035e5b5d1e3127b4925d86f6a77964f91f2c3c;p=pandora-kernel.git

Merge branch 'timers-for-linus-migration' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timers: Logic to move non pinned timers
  timers: /proc/sys sysctl hook to enable timer migration
  timers: Identifying the existing pinned timers
  timers: Framework for identifying pinned timers
  timers: allow deferrable timers for intervals tv2-tv5 to be deferred

Fix up conflicts in kernel/sched.c and kernel/timer.c manually
---

19035e5b5d1e3127b4925d86f6a77964f91f2c3c
Reading git-diff-tree failed