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

Trivial merge