| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 | [log] [tgz] |
|---|---|---|
| author | Arjan van de Ven <arjan@linux.intel.com> | Fri Oct 17 09:20:26 2008 -0700 |
| committer | Arjan van de Ven <arjan@linux.intel.com> | Fri Oct 17 09:20:26 2008 -0700 |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 [diff] | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c [diff] |
Merge commit 'linus/master' into merge-linus Conflicts: arch/x86/kvm/i8254.c