]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'sh/st-integration' into sh/urgent
authorPaul Mundt <lethal@linux-sh.org>
Tue, 15 Feb 2011 07:26:41 +0000 (16:26 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 15 Feb 2011 07:26:41 +0000 (16:26 +0900)

Trivial merge