Merge branch 'i2c'
authorJon Loeliger <jdl@freescale.com>
Fri, 20 Oct 2006 20:54:48 +0000 (15:54 -0500)
committerJon Loeliger <jdl@freescale.com>
Fri, 20 Oct 2006 20:54:48 +0000 (15:54 -0500)

Trivial merge