diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-15 18:50:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-15 18:50:03 +0200 |
| commit | c9192798b9318a4b3f96c41ae27805cc8b46b7ee (patch) | |
| tree | cd943e4e7641c53797fc2918c8230a7f959a071b /net/rds/page.c | |
| parent | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | hrtimer: Preserve timer state in remove_hrtimer() (diff) | |
| download | linux-c9192798b9318a4b3f96c41ae27805cc8b46b7ee.tar.xz linux-c9192798b9318a4b3f96c41ae27805cc8b46b7ee.zip | |
Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimer: Preserve timer state in remove_hrtimer()
Diffstat (limited to 'net/rds/page.c')
0 files changed, 0 insertions, 0 deletions