Merge branch 'rmk-next' into s3c64xx
commitb9914406fb128bee01b2a23a35eafbc83ff915f0
authorBen Dooks <ben-linux@fluff.org>
Tue, 4 Nov 2008 15:31:00 +0000 (4 15:31 +0000)
committerBen Dooks <ben-linux@fluff.org>
Tue, 4 Nov 2008 15:31:00 +0000 (4 15:31 +0000)
tree31d8226c38483e239d2c5a23cacd15ee1cf92770
parentbb7dc6e533ca2cbad443bd88024079de6cf43e8e
parent039d35267d79b9feae3a850f54b2677dea019f0a
Merge branch 'rmk-next' into s3c64xx