Merge branch 'master' of /home/git/linux-omap-2.6
authorJuha Yrjola <jey@source.mvista.com>
Fri, 29 Sep 2006 14:37:11 +0000 (07:37 -0700)
committerJuha Yrjola <jey@source.mvista.com>
Fri, 29 Sep 2006 14:37:11 +0000 (07:37 -0700)

Trivial merge