diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-24 07:21:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-24 07:21:29 +0100 |
| commit | f52ee1410d563cd409b08822492273a5bc235821 (patch) | |
| tree | 18694453f85c25cf7ffea2d9111067451cbaed0b /arch/m32r | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [PATCH] drivers/net/tlan.c: #ifdef CONFIG_PCI the PCI specific code (diff) | |
| download | linux-f52ee1410d563cd409b08822492273a5bc235821.tar.xz linux-f52ee1410d563cd409b08822492273a5bc235821.zip | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch/m32r')
0 files changed, 0 insertions, 0 deletions