tree 2497d587ed0fcadafd1b820f2cc47f2a582e2d69
parent 45d866e1a06dba309f79dbb61ad1db964bb8ee8a
parent e6a5652fd156a286faadbf7a4062b5354d4e346e
author Linus Torvalds <torvalds@linux-foundation.org> 1220650581 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220650581 -0700

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: add io delay quirk for Presario F700