From: David S. Miller Date: Tue, 19 Jan 2010 19:43:42 +0000 (-0800) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... X-Git-Tag: v2.6.34-rc1~233^2~556 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6373464288cab09bc641be301d8d30fc9f64ba71;p=users%2Fdwmw2%2Flinux.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h --- 6373464288cab09bc641be301d8d30fc9f64ba71