diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-09 08:26:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-09 08:26:43 -0800 |
| commit | cdf0c7de29a87cc600ef367893523ea15938da4e (patch) | |
| tree | 00997f8ea89c0bfe7a1f23f12a6780f6319bb542 /kernel/time | |
| parent | f3179748a157c21d44d929fd3779421ebfbeaa93 (diff) | |
| parent | ab44f4627e2160cddbddbe8aa8b1d2b2e1559790 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc/virtex5: Fix Virtex5 machine check handling
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions