summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-15 19:52:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-15 19:52:12 -0800
commit7d0bab9dfecb3717f7e704b60a9f11631cb6636e (patch)
tree57d23b51502649499784fcf3741091f40b366bda /fs/nfs
parent0aa2ca9ae1e08d11661abb00ae6e75ff885448d6 (diff)
parentb9c3032277f756e73f6c673419dc414155e04e46 (diff)
downloadop-kernel-dev-7d0bab9dfecb3717f7e704b60a9f11631cb6636e.zip
op-kernel-dev-7d0bab9dfecb3717f7e704b60a9f11631cb6636e.tar.gz
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimer, softirq: Fix hrtimer->softirq trampoline
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud