From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Apr 2008 16:48:52 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux... 
X-Git-Tag: v2.6.26-rc1~1043
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d485cb9aa2e302fac7e7fb586a0cb4c0a5211be9;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-optimized-inlining

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-optimized-inlining:
  generic: make optimized inlining arch-opt-in
  x86: add optimized inlining
---

d485cb9aa2e302fac7e7fb586a0cb4c0a5211be9