diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 12:43:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 12:43:26 -0500 |
| commit | ceaeee6ad6c2a24bf37d9f426414cf3007432352 (patch) | |
| tree | fa330133773d10a9d7f329e3db2cc371999c6d86 /fs/eventpoll.c | |
| parent | 3743d33edf4e49376384822c57c4ee5cdf2d32f8 (diff) | |
| parent | 5e2862eb5a263a0339a85545d96fb20995d67b1f (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Oprofile: Fix computation of number of counters.
[MIPS] Alchemy: fix IRQ bases
[MIPS] Alchemy: replace ffs() with __ffs()
[MIPS] BCM1480: Fix interrupt routing, take 2.
Diffstat (limited to 'fs/eventpoll.c')
0 files changed, 0 insertions, 0 deletions