diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 03:09:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 03:09:45 +0200 |
| commit | 08839ff8276bd1ba0ce8b2d595f9fe62a5b07210 (patch) | |
| tree | 468a056d2039eb368f3e73c8bfd8124c81dff8bb /drivers/firmware | |
| parent | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | x86: Reorder reboot method preferences (diff) | |
| parent | x86, setup: Fix EDD3.0 data verification. (diff) | |
| download | linux-08839ff8276bd1ba0ce8b2d595f9fe62a5b07210.tar.xz linux-08839ff8276bd1ba0ce8b2d595f9fe62a5b07210.zip | |
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.