diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 02:37:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 02:37:46 +0200 |
| commit | 3a533374283aea50eab3976d8a6d30532175f009 (patch) | |
| tree | 5944a2b40d8b40ec68818eb40235872c609ea741 /drivers/net/tokenring/3c359.c | |
| parent | initrd: Fix virtual/physical mix-up in overwrite test (diff) | |
| parent | Merge branch 'cris_debug_port_fix' into cris (diff) | |
| download | linux-3a533374283aea50eab3976d8a6d30532175f009.tar.xz linux-3a533374283aea50eab3976d8a6d30532175f009.zip | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
[CRISv10] Clean up compressed/misc.c
[CRISv10] Correct whitespace damage.
[CRIS] Correct definition of subdirs for install_headers.
[CRIS] Correct image makefiles to allow using a separate OBJ-directory.
[CRIS] Build fixes for compressed and rescue images for v10 and v32:
It looks at least odd to apply spin_unlock to a mutex.
cris: compile fixes for 2.6.26-rc5
Diffstat (limited to 'drivers/net/tokenring/3c359.c')
0 files changed, 0 insertions, 0 deletions