Merge branch 'topic/asoc' into for-linus

sound/soc/atmel/atmel-pcm.c

@@ -44,8 +44,6 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <mach/hardware.h>
-
 #include "atmel-pcm.h"