diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:38:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:38:30 -0400 |
| commit | bb402c4fb5bba4edf5b8c72b3db8760e60df4876 (patch) | |
| tree | bdc2c2b41806cbab4717e9e1f372ae3d2d1f8cd1 /fs/ocfs2/sysfile.c | |
| parent | 61bd1e858db743af64f6e363c526f7e433d12e0c (diff) | |
| parent | 5679af4c1625a1534a4321e1ecc3c48a1cf65eb8 (diff) | |
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
x86, mce: fix boot logging logic
x86, mce: make polling timer interval per CPU
Diffstat (limited to 'fs/ocfs2/sysfile.c')
0 files changed, 0 insertions, 0 deletions