From: John W. Linville Date: Mon, 18 Feb 2013 18:47:13 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=98d5fac2330779e6eea6431a90b44c7476260dcc;p=linux-edison.git Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem Conflicts: drivers/net/wireless/iwlwifi/dvm/tx.c drivers/net/wireless/ti/wlcore/sdio.c drivers/net/wireless/ti/wlcore/spi.c --- 98d5fac2330779e6eea6431a90b44c7476260dcc