summaryrefslogtreecommitdiff
path: root/drivers/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-12-09 13:11:09 +0400
committerPaul Mundt <lethal@linux-sh.org>2011-12-09 13:11:09 +0400
commit0d376945d0bc0a8f8e00861d506b10e42e8af372 (patch)
tree65f379ba8218519260a8b14b251a3b63f55fc065 /drivers/sh
parent19d7ca2998e095086869318dd2ad966952f5ac82 (diff)
parent2dacb97d9269e303ed761937a0e9db8711515e08 (diff)
parentb0e10211cba1629e2e534ca9cb3d87cfc7e389ea (diff)
parent50f0959ad4f9ac1c5ee208bb820de299a1b3730b (diff)
downloadlinux-0d376945d0bc0a8f8e00861d506b10e42e8af372.tar.xz
Merge branches 'common/clkfwk', 'common/pfc' and 'common/serial-rework' into sh-latest