| commit | 5c0857a9afc74ec83e222ea1b9808988d08139d9 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 15 Feb 2013 20:04:57 +0000 (15 12:04 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 15 Feb 2013 20:04:57 +0000 (15 12:04 -0800) | ||
| tree | fa8344aa83a65a37887a868ce1ad1467c73e3469 | treesnapshot (tar.gz zip) |
| parent | db1b2d323f7914452db5a7071e75f3d159ac6e5d | commitdiff |
| parent | 1de63d60cd5b0d33a812efa455d5933bf1564a51 | commitdiff |
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull one more x86 fix from Peter Anvin:
"Sigh. One more patch in the "please don't brick my Samsung" series"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot parameter
Pull one more x86 fix from Peter Anvin:
"Sigh. One more patch in the "please don't brick my Samsung" series"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot parameter