| commit | 08839ff8276bd1ba0ce8b2d595f9fe62a5b07210 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 19 18:09:45 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 19 18:09:45 2011 -0700 |
| tree | 468a056d2039eb368f3e73c8bfd8124c81dff8bb | |
| parent | 08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86 [diff] | |
| parent | 660e34cebf0a11d54f2d5dd8838607452355f321 [diff] | |
| parent | 0c61227094b3ddaca2f847ee287c4a2e3762b5a2 [diff] |
Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Reorder reboot method preferences * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, setup: Fix EDD3.0 data verification.