diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /sound/ppc/toonie.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'sound/ppc/toonie.c')
| -rw-r--r-- | sound/ppc/toonie.c | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/sound/ppc/toonie.c b/sound/ppc/toonie.c deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/sound/ppc/toonie.c +++ /dev/null | |||