On Mon, Nov 26, 2012 at 07:42:29PM +1100, Stephen Rothwell wrote:

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/misc/atmel-ssc.c between commit 5c86ac695c7e ("ASoC: atmel-ssc:
use module_platform_driver macro") from the sound-asoc tree and commit
2d6bed9ca93e ("drivers/misc: remove use of __devexit_p") from the
char-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Looks good to me, thanks.

greg k-h