diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-22 07:33:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-22 07:33:49 -0700 |
| commit | 1e787d139f89eb5f7080035625649ce4ce290037 (patch) | |
| tree | 20dc621d9f73ff0944b89b7891c0e4006efa46a6 /fs/timerfd.c | |
| parent | 66a26a8fa7694cdfa418d1527416c4ea079309f4 (diff) | |
| parent | 6eb0ac03899a1363ba176abe0830a9e6698c0503 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/maple: Add a quirk to disable MSI for IPR on Bimini
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions