Merge branch 'ucc_geth' of master.kernel.org:/pub/scm/linux/kernel/git/leo/fsl-soc...
authorJeff Garzik <jeff@garzik.org>
Tue, 7 Aug 2007 21:19:44 +0000 (17:19 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 7 Aug 2007 21:19:44 +0000 (17:19 -0400)

Trivial merge