Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Apr 2008 14:43:53 +0000 (07:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Apr 2008 14:43:53 +0000 (07:43 -0700)
commit6be9f7b2835fa442f6b892f174dabc4023c0af2e
tree246a949b7f27f9eed2d52ff78751231b392c7420
parent8774b7f63be0d1b237bc30d49b6486f7691e2ed4
parent34e6bbf23c8f43e8713d9bd092680f1660494b4a
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