Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
authorEric Miao <eric.miao@marvell.com>
Mon, 9 Mar 2009 13:21:07 +0000 (21:21 +0800)
committerEric Miao <eric.miao@marvell.com>
Mon, 9 Mar 2009 13:21:07 +0000 (21:21 +0800)

Trivial merge