]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Mon, 19 May 2008 23:29:40 +0000 (16:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 May 2008 23:29:40 +0000 (16:29 -0700)
commit44dc19c829c057dc78a5ffacaf851ac4c301eb58
tree7da34731e9dfaefaf14f9119158db864b7677a12
parent0686caa35ed17cf5b9043f453957e702a7eb588d
parent229ce3abb6d6d4598de8ef1ed1e2da8163a9bbc0
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6