diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-04-27 02:45:43 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-27 02:45:43 +0200 |
commit | 339b042bb408877dcb734d896cdb52dd20600aab (patch) | |
tree | b0d1f1cc7eba828ad0a8b743a0c4a00df5406c42 /arch/sh/configs | |
parent | clocksource: sh_cmt clocksource support (diff) | |
parent | maple: input: fix up maple mouse driver (diff) | |
parent | sh: pci: Fix up the build for CONFIG_PCI=n. (diff) | |
download | linux-339b042bb408877dcb734d896cdb52dd20600aab.tar.xz linux-339b042bb408877dcb734d896cdb52dd20600aab.zip |
Merge branches 'sh/stable-updates' and 'sh/pci-rework'