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)
commit56e1bd770614da94f35e88c150cf9edf8d0b57a2
tree5a18f6e797e7d60b634fe0d229ae624625af073e
parent9ebea3829fac7505e0cd2642fbd13cfa9c038831
parent5b37649bbcfc14c1ecfb76c5b018dd686924b946
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx

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