diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 17:41:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 17:41:00 -0400 |
| commit | c45140a996b511bccdcbbdbea7e36f001826bdf2 (patch) | |
| tree | 8d6613880399d1a25598f7cb51834efbbda87ad9 /drivers/net/mlx4/mr.c | |
| parent | de329820e920cd9cfbc2127cad26a37026260cce (diff) | |
| parent | 9e8307ecaf9f8c8b5b3b22145021204c4e73114a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Properly truncate pt_regs framepointer in perf callback.
arch/sparc/kernel: Use set_cpus_allowed_ptr
sparc: Fix use of uid16_t and gid16_t in asm/stat.h
Diffstat (limited to 'drivers/net/mlx4/mr.c')
0 files changed, 0 insertions, 0 deletions