diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-10-30 10:08:25 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-10-30 10:08:25 (GMT) |
| commit | a5d00dc3a4b65ed38249f3225e453944c633747b (patch) | |
| tree | 6249ca5a5f13059f42890525a9ea7133778f3891 /drivers/tty/sysrq.c | |
| parent | 1a8506d4402b6e96c2ed778dc7ccbb48d1e02fce (diff) | |
| parent | 0914f7961babbf28aaa2f19b453951fb4841c03f (diff) | |
| download | linux-fsl-qoriq-a5d00dc3a4b65ed38249f3225e453944c633747b.tar.xz | |
Merge branch 'for-linus' into for-next
... for migrating the core changes for USB-audio disconnection fixes
Diffstat (limited to 'drivers/tty/sysrq.c')
| -rw-r--r-- | drivers/tty/sysrq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 05728894..16ee6ce 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -452,6 +452,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { NULL, /* v */ &sysrq_showstate_blocked_op, /* w */ /* x: May be registered on ppc/powerpc for xmon */ + /* x: May be registered on sparc64 for global PMU dump */ NULL, /* x */ /* y: May be registered on sparc64 for global register dump */ NULL, /* y */ |