Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Mon, 29 Nov 2010 19:19:09 +0000 (11:19 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 29 Nov 2010 19:19:09 +0000 (11:19 -0800)
commit77148625e10d0fda50d05e92d199c0df17b66e9a
treefdb5bb1e06933dc8891a3c4d3c93c371801d8b37
parenta41778694806ac1ccd4b1dafed1abef8d5ba98ac
parent51cce8a590c4696d62bfacc63378d1036084cef7
Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless-next-2.6
drivers/net/wireless/zd1211rw/zd_chip.c