[ARM] S3C24XX: Merge devel-gpio
authorBen Dooks <ben-linux@fluff.org>
Thu, 21 May 2009 21:10:21 +0000 (22:10 +0100)
committerBen Dooks <ben-linux@fluff.org>
Thu, 21 May 2009 21:10:21 +0000 (22:10 +0100)
Merge branch 'devel-gpio' into for-rmk-devel

1  2 
drivers/mmc/host/s3cmci.c

Simple merge