diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-07 14:54:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-07 14:54:07 -0700 |
| commit | ff09e2afe742f3ff52a0c9a660e8a3fe30cf587c (patch) | |
| tree | aff06e82c7d653d0b15c1f3cae7f0c8a90ba3d14 /net/bridge/br_stp_if.c | |
| parent | ad3c7e42e33a842cf3b518e21a7f69e167649d8a (diff) | |
| parent | 9c5a3d729cf430609d091ff610a7db363aafcd47 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus:
[MIPS] Handle aliases in vmalloc correctly.
Diffstat (limited to 'net/bridge/br_stp_if.c')
0 files changed, 0 insertions, 0 deletions