tree df744b76afde73a8649400583bf7dfa1f7e30245
parent d23b3517400e4638e76e8c8667c100721c6f03fe
parent b93011e72c1476b08ff62977ecf648080ba38c1a
author Ben Dooks <ben-linux@fluff.org> 1253178768 +0100
committer Ben Dooks <ben-linux@fluff.org> 1253178768 +0100

Merge branch 'next-s3c64xx-fixes' into next-s3c-fixes