diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-26 20:45:43 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-26 20:45:43 -0400 |
| commit | 339b042bb408877dcb734d896cdb52dd20600aab (patch) | |
| tree | b0d1f1cc7eba828ad0a8b743a0c4a00df5406c42 /arch/powerpc/kernel/softemu8xx.c | |
| parent | 19bdc9d061bcb71efd2b53083d96b59bbe1a1751 (diff) | |
| parent | 6b3480855aad6e22ca90981a4c7893a7f41ffb47 (diff) | |
| parent | 3e98f9f15e916c48dfc5231d7e6a59be7f122764 (diff) | |
Merge branches 'sh/stable-updates' and 'sh/pci-rework'