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)
1  2 
drivers/mfd/glamo/glamo-fb.c

Simple merge