]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 30 Dec 2009 03:44:25 +0000 (19:44 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Dec 2009 03:44:25 +0000 (19:44 -0800)
commit7f9d3577e2603ca279c3176b696eba392f21cbe2
treee2135eddba600910cdebb54c8b01de53473ecefb
parent96c5340147584481ef0c0afbb5423f7563c1d24a
parent55afc80b2ab100618c17af77915f75307b6bd5d1
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/zd1211rw/zd_mac.c