Merge branch 'for-linus' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 17:02:58 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 17:02:58 +0000 (10:02 -0700)
commita93a1329271038f0e8337061d3b41b3b212a851e
treee33d0e6a2959e8aae8a7a9cb03581340010d752c
parent757c26b804428ef10888b8e00f34994dbe361d3a
parent11ccf116d0d756d06989775288e41f737d98e0c5
Merge branch 'for-linus' of git://git.kernel.dk/linux-block

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: fix warning with calling smp_processor_id() in preemptible section