Merge branch 'master' of /home/git/linux-omap-2.6
authorJuha Yrjola <jey@source.mvista.com>
Wed, 6 Sep 2006 13:56:45 +0000 (06:56 -0700)
committerJuha Yrjola <jey@source.mvista.com>
Wed, 6 Sep 2006 13:56:45 +0000 (06:56 -0700)

Trivial merge