| commit | f78e80209cf143be49f268c340431ae9fa3abb74 | [log] [tgz] |
|---|---|---|
| author | Robert Richter <robert.richter@amd.com> | Wed Sep 24 11:25:31 2008 +0200 |
| committer | Robert Richter <robert.richter@amd.com> | Wed Sep 24 11:25:31 2008 +0200 |
| tree | 820fa64b688099dfdd93d27ba03252738ca5c7e2 | |
| parent | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d [diff] | |
| parent | 24342c34a022ee90839873d91396045e12ef1090 [diff] |
Merge commit 'v2.6.27-rc5' into tip/oprofile Conflicts: arch/x86/oprofile/nmi_int.c