Merge branch 'defconfig-s3c2410' of git://aeryn.fluff.org.uk/bjdooks/linux