diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-29 21:29:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-29 21:29:12 +1000 |
| commit | e4eacbea9a418a88bc4a2b44db5ed6b2250afde0 (patch) | |
| tree | 50760896ecca78281df27906769fa19b670dc805 /scripts/gdb/linux/dmesg.py | |
| parent | c12d56184d6f6526261d6b1811ddc63aa8db8b1d (diff) | |
| parent | 8c169d94c31fced71d907e26b19b4f5f0bd9d7bf (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/kernel/machine_kexec_64.c
drivers/staging/android/lowmemorykiller.c
Diffstat (limited to 'scripts/gdb/linux/dmesg.py')
| -rw-r--r-- | scripts/gdb/linux/dmesg.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/gdb/linux/dmesg.py b/scripts/gdb/linux/dmesg.py index 3c947f0c5dad..927d0d2a3145 100644 --- a/scripts/gdb/linux/dmesg.py +++ b/scripts/gdb/linux/dmesg.py @@ -12,7 +12,6 @@ # import gdb -import string from linux import utils |