diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-03 03:06:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-03 03:06:03 +0100 |
| commit | 7cbe010a5ea728d7c4440b11a1a3997faca0e46d (patch) | |
| tree | 9132c4c60a236f58f532086a0d8b8cc3fdf180fc /arch/x86/kernel/probe_roms.c | |
| parent | Staging: lustre: lnet: lnet: Better cookie gen (diff) | |
| parent | Linux 3.18-rc3 (diff) | |
| download | linux-7cbe010a5ea728d7c4440b11a1a3997faca0e46d.tar.xz linux-7cbe010a5ea728d7c4440b11a1a3997faca0e46d.zip | |
Merge 3.18-rc3 into staging-next
We want the upstream fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel/probe_roms.c')
0 files changed, 0 insertions, 0 deletions