]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'master' of git://ok.research.nokia.com/osso/git/linux-sp
authorToshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
Thu, 9 Feb 2006 12:08:07 +0000 (14:08 +0200)
committerPaul Mundt <paul.mundt@nokia.com>
Thu, 9 Feb 2006 12:08:07 +0000 (14:08 +0200)

Trivial merge