]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Jan 2013 19:03:20 +0000 (14:03 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Jan 2013 19:03:20 +0000 (14:03 -0500)
commit0652e4c1231cadba7cc01994f704e61e8bf2443a
tree5a18f6e797e7d60b634fe0d229ae624625af073e
parent4d31cb051a91a9ccd53801dbe135bd2e6ed42f5a
parent790966e7c27f582b0dff5382265a4f69f1c6161c
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx

Conflicts:
drivers/net/wireless/ti/wlcore/main.c
drivers/net/wireless/ti/wlcore/main.c