The Verge has published a nice chart comparing the iPhone 4S vs. iPhone 4 vs. Samsung Galaxy S II.

Please take a look at the chart below

Apple also has their own chart comparing the devices...

iPhone 4S vs. iPhone 4 vs. Galaxy S II [Chart]