]> 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)
commit06687967374142c8ec2fdb585f784bd7553dc4d2
tree5a18f6e797e7d60b634fe0d229ae624625af073e
parent897b3debff844bc436ab948041fa726e784cd9ad
parentbd62f5af58cf19a1054bb68b439bd43ea0e2ac34
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