Also Atmel, although they're either so new to the market or the volume that they ship is so small compared to other manufacturers that they don't appear in any lists that I've seen.
http://www.atmel.com/products/other/field_programmable_gate_...
http://www.atmel.com/products/other/field_programmable_gate_...
I seem to remember that they had some early 8051 and possibly even AVR devices that had some programmable logic blocks on board too.
This reminded me of a cool video I watched the other day, so I made a new post about it - https://news.ycombinator.com/item?id=9486128