From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jul 2011 17:02:58 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: v3.1-rc1~229
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a93a1329271038f0e8337061d3b41b3b212a851e;p=thirdparty%2Fkernel%2Flinux.git

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
---

a93a1329271038f0e8337061d3b41b3b212a851e