Merge branch 'master' of /home/khilman/work/kernel/omap/pristine/
authorKevin Hilman <khilman@deeprooted.net>
Fri, 23 Jun 2006 22:14:43 +0000 (15:14 -0700)
committerKevin Hilman <khilman@deeprooted.net>
Fri, 23 Jun 2006 22:14:43 +0000 (15:14 -0700)

Trivial merge