diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-09-17 14:40:19 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-09-17 14:40:49 -0700 |
| commit | 3bb045f1e2e51124200ef043256df4c7ad86bebd (patch) | |
| tree | 78e4150fc7108bef4d8fa183d7f7dc00beb73a54 /arch/arm/mach-sa1100/sleep.S | |
| parent | 80938332d8cf652f6b16e0788cf0ca136befe0b5 (diff) | |
| parent | dcb73bf402e0d5b28ce925dbbe4dab3b00b21eee (diff) | |
Merge branch 'x86/pat' into x86/urgent
Merge reason:
Suresh Siddha (1):
x86, pat: don't use rb-tree based lookup in reserve_memtype()
... requires previous x86/pat commits already pushed to Linus.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/arm/mach-sa1100/sleep.S')
0 files changed, 0 insertions, 0 deletions