summaryrefslogtreecommitdiffstats
path: root/arch/sh/boot
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-21 17:37:18 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-07-21 17:37:18 +0900
commitfc6cca3917e6594eb93c0b5e2226342eab175041 (patch)
tree4cbc9213aa22c19eb652cf1db22ede2a9dda26e2 /arch/sh/boot
parent6bde607e699b9f3c6fa5e4a97d78c7778e643b3d (diff)
parentef9b542fce00dafc6bb1d9097b045a777f4a2382 (diff)
parentaea1f7964ae6cba5eb419a958956deb9016b3341 (diff)
downloadlinux-fc6cca3917e6594eb93c0b5e2226342eab175041.tar.gz
linux-fc6cca3917e6594eb93c0b5e2226342eab175041.tar.bz2
linux-fc6cca3917e6594eb93c0b5e2226342eab175041.zip
Merge branches 'sh/compressors' and 'sh/stable-updates'