From: David S. Miller Date: Sat, 25 Apr 2009 23:36:46 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=495a1b4eff1a216a3ea171ac137f1807e6555f52;p=linux-beck.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 Conflicts: net/mac80211/pm.c --- 495a1b4eff1a216a3ea171ac137f1807e6555f52