Merge commit 'ee13924' into cg_merges_20130523a

Conflicts:
	README

README

@@ -251,6 +251,7 @@ GPU only options:
 scrypt only options:
 
 --lookup-gap <arg>  Set GPU lookup gap for scrypt mining, comma separated
+--shaders <arg>     GPU shaders per card for tuning scrypt, comma separated
 --thread-concurrency <arg> Set GPU thread concurrency for scrypt mining, comma separated
 
 See README.scrypt for more information regarding (non-bitcoin) scrypt mining.

README.GPU

@@ -396,7 +396,8 @@ and use the appropriate parameter with --gpu-platform.
 
 Q: I'm getting much lower hashrates than I should be for my GPU?
 A: Look at your driver/SDK combination and disable power saving options for your
-GPU. Specifically look to disable ULPS.
+GPU. Specifically look to disable ULPS. Make sure not to set intensity above 11
+for Bitcoin mining.
 
 Q: Can I mine with AMD while running Nvidia or Intel GPUs at the same time?
 A: If you can install both drivers successfully (easier on windows) then yes,
@@ -423,6 +424,10 @@ A: You are generating garbage hashes due to your choice of settings. Try
 decreasing your intensity, do not increase the number of gpu-threads, and
 consider adding system RAM to match your GPU ram.
 
+Q: Scrypt fails to initialise the kernel every time?
+A: Your parameters are too high. Don't add GPU threads, don't set intensity too
+high, decrease thread concurrency. See the README.scrypt for a lot more help.
+
 Q: Should I use crossfire/SLI?
 A: It does not benefit mining at all and depending on the GPU may actually
 worsen performance.

README.scrypt

@@ -223,7 +223,7 @@ for a hashrate of 725kH.
 
 Note I did not bother setting a thread concurrency. Once you have the magic
 endpoint, look at what tc was chosen by the bin file generated and then hard
-code that in next time (eg --thread-concurrency 22336) as slight changes in
+code that in next time (eg --thread-concurrency 22392) as slight changes in
 thread concurrency will happen every time if you don't specify one, and the tc
 to clock ratios are critical!