]> Pileus Git - ~andy/linux/commit
Merge branch 'sh/stable-updates'
authorPaul Mundt <lethal@linux-sh.org>
Fri, 16 Oct 2009 09:16:02 +0000 (18:16 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 16 Oct 2009 09:16:02 +0000 (18:16 +0900)
commit78aed4a63aaa67f22cb1b541dd7528139a24c289
tree56c0e18d498dee86ec9ff018d6070c8d08443be1
parent896f0c0e8e4ee02ee72a203aef79f362d5f7b7cc
parentf875295c4bfb39e96d136edd8ac80567e73536b4
Merge branch 'sh/stable-updates'

Conflicts:
arch/sh/Kconfig
arch/sh/Kconfig