]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Mon, 21 Dec 2009 02:59:55 +0000 (11:59 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 21 Dec 2009 02:59:55 +0000 (11:59 +0900)

Trivial merge