Most of the renewable energies we profile in The Solar Guide can be said to be both solar and renewable. Most of our "renewable energies" get their basic energy from solar radiation. Wind is caused by the heating action of the sun; hydro relies on the hydrologic cycle (which relies on the sun); and geothermal is technically "stored solar energy."
In a more general sense, "renewable energy" is any energy that is self-replenishing. For example, we do not need to find new 'reservoirs' of wind, solar or geothermal energy. The energy is always there, though critics note that these are usually "limited flow."