From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Aug 2010 17:06:28 +0000 (-0700)
Subject: Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.36-rc1~528
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7ddc2b6cd880a259db338925d03bdc01f1d26c1;p=pandora-kernel.git

Merge branch 'x86-mrst-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mrst: make mrst_timer_options an enum
  x86, mrst: make mrst_identify_cpu() an inline returning enum
  x86, mrst: add more timer config options
  x86, mrst: add cpu type detection
  x86: detect scattered cpuid features earlier
---

f7ddc2b6cd880a259db338925d03bdc01f1d26c1
Reading git-diff-tree failed