From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Apr 2008 14:43:53 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.25-rc9~101
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6be9f7b2835fa442f6b892f174dabc4023c0af2e;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: fix rcu freeing of cfq io contexts
  Fix bounce setting for 64-bit
---

6be9f7b2835fa442f6b892f174dabc4023c0af2e