diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-22 02:38:22 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-22 02:38:22 +0200 |
| commit | 94aca80897501f994c795cffc458ecd0404377c7 (patch) | |
| tree | 312f96755c4e7ab4c50766aea35c9e7aa2ebe015 /arch/m68k/q40 | |
| parent | Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso (diff) | |
| parent | x86, vdso: Fix an OOPS accessing the HPET mapping w/o an HPET (diff) | |
| download | linux-94aca80897501f994c795cffc458ecd0404377c7.tar.xz linux-94aca80897501f994c795cffc458ecd0404377c7.zip | |
Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso
Resolved Conflicts:
arch/x86/vdso/vdso32-setup.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/m68k/q40')
0 files changed, 0 insertions, 0 deletions