Merge branch 'master' of /home/git/linux-omap-2.6
authorJuha Yrjola <jey@source.mvista.com>
Tue, 5 Sep 2006 12:10:12 +0000 (05:10 -0700)
committerJuha Yrjola <jey@source.mvista.com>
Tue, 5 Sep 2006 12:10:12 +0000 (05:10 -0700)

Trivial merge