Merge branch 'spi/s3c64xx' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 30 Jan 2012 15:32:37 +0000 (08:32 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 30 Jan 2012 15:32:37 +0000 (08:32 -0700)
commitbc266185888e4033d8439b4fc6bdd14a41f4041e
tree1455fafca38f366b092766594b9d71975bc12d50
parentdcd6c92267155e70a94b3927bce681ce74b80d1f
parentb97b662174162b44944abd0fa9faea50006ba711
Merge branch 'spi/s3c64xx' of git://git./linux/kernel/git/broonie/misc

Conflicts:
drivers/spi/spi-s3c64xx.c
drivers/spi/spi-s3c64xx.c