summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-13 13:02:55 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-01-13 13:02:55 +0900
commit644755e7867710a23e6243dcc69cfc071985f560 (patch)
tree7cc1ad648d2f5631ae0bb8bf73f3bc30e0709605 /mm
parent6430a5987f8bb9a7c5187b343956aa8ef404d571 (diff)
parent0ea820cf9bf58f735ed40ec67947159c4f170012 (diff)
parentfa94ddea2b29fdda7640672c8a933dbd901f0278 (diff)
parent066000dd856709b6980123eb39b957fe26993f7b (diff)
downloadlinux-644755e7867710a23e6243dcc69cfc071985f560.tar.gz
linux-644755e7867710a23e6243dcc69cfc071985f560.tar.bz2
linux-644755e7867710a23e6243dcc69cfc071985f560.zip
Merge branches 'sh/xstate', 'sh/hw-breakpoints' and 'sh/stable-updates'