Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Apr 2008 16:48:52 +0000 (09:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Apr 2008 16:48:52 +0000 (09:48 -0700)
* '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

1  2 
arch/x86/Kconfig

Simple merge