diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 15:24:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 15:24:32 -0700 |
| commit | ea876441052c2cebc27d9bd2a6f6b9bce6add408 (patch) | |
| tree | 893b7597eacfdcce478212170d0b821d6508a1d9 /fs/timerfd.c | |
| parent | 80f506918fdaaca6b574ba931536a58ce015c7be (diff) | |
| parent | 71999d9862e667f1fd14f8fbfa0cce6d855bad3f (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86/paravirt: Use normal calling sequences for irq enable/disable
x86: fix kernel panic on 32 bits when profiling
x86: Fix Suspend to RAM freeze on Acer Aspire 1511Lmi laptop
x86, vmi: Mark VMI deprecated and schedule it for removal
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions