Merge commit 'remotes/openmoko/andy-tracking' into drm-tracking
authorThomas White <taw@bitwiz.org.uk>
Fri, 11 Sep 2009 11:49:39 +0000 (12:49 +0100)
committerThomas White <taw@bitwiz.org.uk>
Fri, 11 Sep 2009 11:49:39 +0000 (12:49 +0100)
commitcd38bcdac64aec45575ed58de66db4a2fbf1914d
tree450333c7a1c67685db627edda3e1376a5bd46a2e
parent166226209d59b1210cadfdec6b31e7d633100d9d
parenta3587e4ed77974adfb057af261aaeea4022018e8
Merge commit 'remotes/openmoko/andy-tracking' into drm-tracking
arch/arm/mach-s3c2442/mach-gta02.c
drivers/mfd/glamo/glamo-fb.c
drivers/mfd/glamo/glamo-mci.c