resolved conflicts for merge of d6c8ae9c to master

Change-Id: I3cbb6ed0958b4328aca1798c7fe6080c31555a3a
This commit is contained in:
Mark Salyzyn 2015-02-24 16:57:19 -08:00
commit 59b0b568d0

View File

@ -239,6 +239,10 @@ static void dumpstate() {
dump_file("LAST PANIC CONSOLE", "/data/dontpanic/apanic_console"); dump_file("LAST PANIC CONSOLE", "/data/dontpanic/apanic_console");
dump_file("LAST PANIC THREADS", "/data/dontpanic/apanic_threads"); dump_file("LAST PANIC THREADS", "/data/dontpanic/apanic_threads");
/* kernels must set CONFIG_PSTORE_PMSG, slice up pstore with device tree */
run_command("LAST LOGCAT", 10, "logcat", "-L", "-v", "threadtime",
"-b", "all", "-d", "*:v", NULL);
/* The following have a tendency to get wedged when wifi drivers/fw goes belly-up. */ /* The following have a tendency to get wedged when wifi drivers/fw goes belly-up. */
run_command("NETWORK INTERFACES", 10, "ip", "link", NULL); run_command("NETWORK INTERFACES", 10, "ip", "link", NULL);