tree 246a949b7f27f9eed2d52ff78751231b392c7420
parent 8774b7f63be0d1b237bc30d49b6486f7691e2ed4
parent 34e6bbf23c8f43e8713d9bd092680f1660494b4a
author Linus Torvalds <torvalds@linux-foundation.org> 1207147433 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1207147433 -0700

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