Merge branch 'for-linus' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Jan 2012 20:41:10 +0000 (12:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Jan 2012 20:41:10 +0000 (12:41 -0800)
commit5e5997849a8eae7a895a88699a1999b637f87303
tree3d5dc81509583183ccd1a262e6e4e17aede834c0
parent00b1d444afc2e5c3129b4a9c16b1de03c0fce3f0
parent54b466e44b1c7809144bbd8cd6be3f85877ca46f
Merge branch 'for-linus' of git://git.kernel.dk/linux-block

* 'for-linus' of git://git.kernel.dk/linux-block:
  cfq-iosched: fix use-after-free of cfqq