]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Feb 2013 19:50:31 +0000 (14:50 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Feb 2013 19:50:31 +0000 (14:50 -0500)
1  2 
drivers/net/wireless/mwifiex/sdio.c

Simple merge