diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-07 19:42:43 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-07 19:42:43 -0500 |
commit | 21e14266284bf448faabb4485895d72d8af1f2d8 (patch) | |
tree | fb27b7cb7ddd137d12cd3a61c13a758a3e558ce8 | |
parent | 151f52f09c5728ecfdd0c289da1a4b30bb416f2c (diff) | |
parent | e2781ac2a63011dd883e94c07eb086e6f2a5f521 (diff) | |
parent | edc9a958fd31ef1d89f9eaee82b2a3882c8e34c9 (diff) | |
parent | a766b29790b2b6582345624a6e9e686d8015efe1 (diff) | |
parent | ccedb20c6879ac0237b95b3500d69822f1e5e2ea (diff) | |
parent | 20f95e0b22ea45c1798261064baab57efeb3b3bc (diff) |
Merge branches 'sh/pio-death', 'sh/nommu', 'sh/clkfwk', 'sh/core' and 'sh/intc-extension' into sh-fixes-for-linus