tree 38f0e2865cc6c1eac3311cdf7539853afd222f4b
parent 150cd843fac0160fce616fb3e5cbe64e9db7481e
parent 8654b1c2de1465120974899fc1c8aa00e91d4b7e
author Linus Torvalds <torvalds@linux-foundation.org> 1288293942 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1288293942 -0700

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

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Move olpc to platform
  x86: Move uv to platform
  x86: Move mrst to platform
  x86: Move scx200 to platform
  x86: Move visws to platform
  x86: Move efi to platform
  x86: Move sfi to platform
  x86: Add platform directory