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)
commitd485cb9aa2e302fac7e7fb586a0cb4c0a5211be9
tree1dd01f33dc1d77bcc0417497bd1af1c642f6e16d
parent1292ebb82c00c69cf983e871faa221ce88ed3338
parent765c68bd54c76d4126796e49af2a1428a258429f
Merge branch 'for-linus' of git://git./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
arch/x86/Kconfig