summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-04-27 02:45:43 +0200
committerPaul Mundt <lethal@linux-sh.org>2009-04-27 02:45:43 +0200
commit339b042bb408877dcb734d896cdb52dd20600aab (patch)
treeb0d1f1cc7eba828ad0a8b743a0c4a00df5406c42 /include
parentclocksource: sh_cmt clocksource support (diff)
parentmaple: input: fix up maple mouse driver (diff)
parentsh: pci: Fix up the build for CONFIG_PCI=n. (diff)
downloadlinux-339b042bb408877dcb734d896cdb52dd20600aab.tar.xz
linux-339b042bb408877dcb734d896cdb52dd20600aab.zip
Merge branches 'sh/stable-updates' and 'sh/pci-rework'