diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-04-19 08:31:59 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-04-19 08:31:59 (GMT) |
commit | fb56a91922463abec52a68e26b562c4503810d40 (patch) | |
tree | c82e27b784658dcf0c7a3132a25bf0920e1f21be /arch/sh/mm | |
parent | 9d773d378d9b7272c6cefad5cb41b5e57c96b7a0 (diff) | |
parent | 9e7f60a37d1817460ffcdfc2001a00861ac3e121 (diff) | |
parent | 5d920bb929a99446062a48cf90867bbca57b8e77 (diff) | |
download | linux-fb56a91922463abec52a68e26b562c4503810d40.tar.xz |
Merge branches 'sh/st-integration' and 'sh/stackprotector' into sh-latest