diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-03-02 11:49:25 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-02 11:49:25 +0900 |
commit | 9adae9720998c10a882d4c6f9a82527bf8f62d59 (patch) | |
tree | 5a06d5c18c9d97485741365fe39d03bc68a38be4 /arch | |
parent | 73a19e4c0301908ce6346715fd08a74308451f5a (diff) | |
parent | 105244ec95590f5f12a90d974650ab5c7bc8ec79 (diff) | |
parent | 4b62c0f1e76fe3327b695c49195af8b58e4da057 (diff) | |
download | linux-3.10-9adae9720998c10a882d4c6f9a82527bf8f62d59.tar.gz linux-3.10-9adae9720998c10a882d4c6f9a82527bf8f62d59.tar.bz2 linux-3.10-9adae9720998c10a882d4c6f9a82527bf8f62d59.zip |
Merge branches 'sh/dmaengine', 'sh/hw-breakpoints' and 'sh/trivial'