Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
authorEric Miao <eric.miao@marvell.com>
Mon, 9 Mar 2009 13:20:23 +0000 (21:20 +0800)
committerEric Miao <eric.miao@marvell.com>
Mon, 9 Mar 2009 13:20:23 +0000 (21:20 +0800)

Trivial merge