Merge branch spi-next from git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorGrant Likely <grant.likely@secretlab.ca>
Sat, 9 Feb 2013 16:02:44 +0000 (16:02 +0000)
committerGrant Likely <grant.likely@secretlab.ca>
Sat, 9 Feb 2013 16:02:44 +0000 (16:02 +0000)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Trivial merge