From: Daniel Morsing Date: Wed, 27 Jul 2011 11:53:28 +0000 (+0200) Subject: staging: brcm80211: Fix double include introduced by bad merge X-Git-Tag: v3.1-rc1~146 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aae36cdf12313cd9cc0e4799fe1ea64d3c623f3;p=pandora-kernel.git staging: brcm80211: Fix double include introduced by bad merge A merge with Linus' tree added a double include of linux/interrupt.h. Fix by removing one of the includes. Signed-off-by: Daniel Morsing Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed