Merge branch 'i2c'
authorJon Loeliger <jdl@freescale.com>
Fri, 20 Oct 2006 22:16:50 +0000 (17:16 -0500)
committerJon Loeliger <jdl@freescale.com>
Fri, 20 Oct 2006 22:16:50 +0000 (17:16 -0500)

Trivial merge