diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 17:21:19 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 17:21:19 (GMT) |
| commit | e7b30a17c1ef5cbc67c5381407d2d03484b8def3 (patch) | |
| tree | ac54eb1084609a1d8d910e563299b3d7a2587020 /fs/dlm | |
| parent | 19bec32d7f26f263dba13f2797d9c3245de2020b (diff) | |
| parent | b2d668da9307c4c163dd603d2bb3cadb10f9fd37 (diff) | |
| download | linux-fsl-qoriq-e7b30a17c1ef5cbc67c5381407d2d03484b8def3.tar.xz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/urgent branch from Ingo Molnar:
"These are the fixes left over from the very end of the v3.4
stabilization cycle, plus one more fix."
Ugh. Those KERN_CONT additions are just pointless. I think they came
as a reaction to some of the early (broken) printk() work - but that was
fixed before it was merged.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, relocs: Build clean fix
x86, printk: Add missing KERN_CONT to NMI selftest
x86: Fix boot on Twinhead H12Y
Diffstat (limited to 'fs/dlm')
0 files changed, 0 insertions, 0 deletions