diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-05 16:34:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-05 16:34:38 -0700 |
| commit | 03cb00b3c7cc356d0df1d7198d8485b824fef1c8 (patch) | |
| tree | 07561c3c8bf2a7b8484effbfc53dad3816f054f6 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | TTY: pdc_cons, fix regression in close (diff) | |
| parent | alpha: silence 'const' warning in sys_marvel.c (diff) | |
| download | wireguard-linux-03cb00b3c7cc356d0df1d7198d8485b824fef1c8.tar.xz wireguard-linux-03cb00b3c7cc356d0df1d7198d8485b824fef1c8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha
Pull alpha fixes from Matt Turner:
"My alpha tree is back up (after taking quite some time to get my GPG
key signed). It contains just some simple fixes."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
alpha: silence 'const' warning in sys_marvel.c
alpha: include module.h to fix modpost on Tsunami
alpha: properly define get/set_rtc_time on Marvel/SMP
alpha: VGA_HOSE depends on VGA_CONSOLE
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions