diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 13:19:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 13:19:40 -0700 |
| commit | 53e16fbd30005905168d9b75555fdc7e0a2eac58 (patch) | |
| tree | b0227d0b96aa1e7c5a7f4ac1bdc90a5c36e3b566 /lib/sort.c | |
| parent | 4e3408d9f71a70316ebe844c20ef0d7715281f84 (diff) | |
| parent | 42c2c8c854a716b05882a122632ddcd6dbe108f1 (diff) | |
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
printk: Fix "printk: Enable the use of more than one CON_BOOT (early console)"
printk: Restore previous console_loglevel when re-enabling logging
printk: Ensure that "console enabled" messages are printed on the console
printk: Enable the use of more than one CON_BOOT (early console)
Diffstat (limited to 'lib/sort.c')
0 files changed, 0 insertions, 0 deletions