diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 22:02:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 22:02:48 +0200 |
| commit | 332edc2f7fa58b818dfed1cede60272eecc27c0a (patch) | |
| tree | e2c795a100bac6351d1247e4d8a45d8c42e0e905 /drivers/net/hamachi.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
| parent | staging: pcc_acpi: delete obsolete driver (diff) | |
| download | linux-332edc2f7fa58b818dfed1cede60272eecc27c0a.tar.xz linux-332edc2f7fa58b818dfed1cede60272eecc27c0a.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
staging: pcc_acpi: delete obsolete driver
Diffstat (limited to 'drivers/net/hamachi.c')
0 files changed, 0 insertions, 0 deletions