tree 23fc946678d2d4bce1b74caab057333b433da150
parent ad21b115772dfa146f19ec5d1db9de25973c483b
parent a536877e77f73ea22d12d94a019fedd9671b6acd
author Linus Torvalds <torvalds@linux-foundation.org> 1311276339 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311276339 -0700

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

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Make Dell Latitude E6420 use reboot=pci
  x86: Make Dell Latitude E5420 use reboot=pci