diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-27 08:37:30 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-27 08:37:30 +0100 |
commit | c40e0fa51cc746cd2da58ca0b98c2f61280c7b4d (patch) | |
tree | 097dabe9365e1010c0658449fcc23558e8598da4 /net/Makefile | |
parent | Merge branch 'sh/clkfwk' into sh-latest (diff) | |
parent | sh: se7724: fix compile breakage (diff) | |
parent | sh: add platform_device for SPI1 in setup-sh7757 (diff) | |
download | linux-c40e0fa51cc746cd2da58ca0b98c2f61280c7b4d.tar.xz linux-c40e0fa51cc746cd2da58ca0b98c2f61280c7b4d.zip |
Merge branches 'sh/urgent' and 'sh/platform-updates' into sh-latest