Merge branch 'andy-tracking' into drm-tracking
authorThomas White <taw@bitwiz.org.uk>
Thu, 26 Nov 2009 21:06:58 +0000 (22:06 +0100)
committerThomas White <taw@bitwiz.org.uk>
Thu, 26 Nov 2009 21:06:58 +0000 (22:06 +0100)
commit9811283a233b55428a99771f803d2ca0f80d29de
treef41b7c5958f865c1015c3e2f29f0ffdfccdc78e6
parentdd6196f5cc0cd707e7f694f52d7e847e066a1967
parentb90406de472c1aa5371ab593a2bb79136d5de658
Merge branch 'andy-tracking' into drm-tracking
drivers/mfd/glamo/glamo-fb.c