tree b75f47e26372ffa2374b744a6991144032eea6ef
parent 69e372896791c2e43949b32d4cbe8a714961d3d7
parent a2c195fdde20772a90ee98ce3523dcfbda49eee6
author Ben Dooks <ben-linux@fluff.org> 1250259814 +0100
committer Ben Dooks <ben-linux@fluff.org> 1250259814 +0100

Merge branch 'next-s3c24xx' into next-s3c