diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-10 10:59:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-10 10:59:39 -0700 |
| commit | d90d2c385d4d832428d1e51c2a7edeef39c822f5 (patch) | |
| tree | 979edd96372170564f8b0f9b2e230dc0cde85794 /drivers/net/e1000/e1000_ethtool.c | |
| parent | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (diff) | |
| parent | [PATCH] powerpc: Fix cell blade detection (diff) | |
| download | linux-dev-d90d2c385d4d832428d1e51c2a7edeef39c822f5.tar.xz linux-dev-d90d2c385d4d832428d1e51c2a7edeef39c822f5.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[PATCH] powerpc: Fix cell blade detection
[PATCH] powerpc: Fix call to ibm,client-architecture-support
powerpc: Fix machine check problem on 32-bit kernels
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
0 files changed, 0 insertions, 0 deletions