diff options
author | 2014-10-03 11:24:46 -0700 | |
---|---|---|
committer | 2014-10-03 11:24:46 -0700 | |
commit | 447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (patch) | |
tree | 676e741f2552c9cb301e1e49c557b92bf8940f55 /kernel/panic.c | |
parent | Input: i8042 - fix Asus X450LCP touchpad detection (diff) | |
parent | Input: soc_button_array - convert to platform bus (diff) | |
download | wireguard-linux-447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6.tar.xz wireguard-linux-447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6.zip |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.18.
Diffstat (limited to 'kernel/panic.c')
-rw-r--r-- | kernel/panic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 62e16cef9cc2..d09dc5c32c67 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -224,6 +224,7 @@ static const struct tnt tnts[] = { { TAINT_FIRMWARE_WORKAROUND, 'I', ' ' }, { TAINT_OOT_MODULE, 'O', ' ' }, { TAINT_UNSIGNED_MODULE, 'E', ' ' }, + { TAINT_SOFTLOCKUP, 'L', ' ' }, }; /** |