commit | acbaa41a780490c791492c41144c774c04875af1 | [log] [tgz] |
---|---|---|
author | Ingo Molnar <mingo@elte.hu> | Sun Oct 12 12:43:21 2008 +0200 |
committer | Ingo Molnar <mingo@elte.hu> | Sun Oct 12 12:43:21 2008 +0200 |
tree | 31f1f046875eb071e2aed031e5d9d1584742314f | |
parent | 8d89adf44cf750e49691ba5b744b2ad77a05e997 [diff] | |
parent | fd048088306656824958e7783ffcee27e241b361 [diff] |
Merge branch 'linus' into x86/quirks Conflicts: arch/x86/kernel/early-quirks.c