On Wed, Jul 11, 2012 at 09:10:59PM +0530, Thomas Abraham wrote:

Changes since v4:
- Includes the missing gpio request for slave select line gpio as suggested
  by Mark Brown.

These looked OK (and have had quite a bit of review already so we're
probably at the stage where incremental fixes are better anyway) so I
tried to apply them but git am was really unhappy.  I tried applying on

  git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git spi-next

and -next.  Can you check what's going on here please?