From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Apr 2008 20:39:07 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.25-rc9~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=999646e3f953c734f8eced551fc1ea28719ba7a7;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  cfq-iosched: do not leak ioc_data across iosched switches
  splice: fix infinite loop in generic_file_splice_read()
---

999646e3f953c734f8eced551fc1ea28719ba7a7