Merge branch 'topic/remove-irqf_disable' into for-linus
commit9430148d800dd929ad73da4c6afb67f793f8af43
authorTakashi Iwai <tiwai@suse.de>
Wed, 26 Oct 2011 21:51:48 +0000 (26 23:51 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 26 Oct 2011 21:51:48 +0000 (26 23:51 +0200)
tree437d0aec41428cbb310a202100ba581c63fbe89e
parentd22665702226e9c40bc331098559e3d55e7cd43d
parent88e24c3a4b30a6bd361f2b5ce602667a8161b2e8
Merge branch 'topic/remove-irqf_disable' into for-linus
sound/soc/codecs/ssm2602.c
sound/soc/soc-core.c