Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 Jan 2010 05:33:49 +0000 (21:33 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Jan 2010 05:33:49 +0000 (21:33 -0800)
commitff30b3642c1f56a5ae6522b78e82be867086c637
tree160f2dfd9d98a0d64ba9eb01574888b04905b58d
parent9db2f1bec36805e57a003f7bb90e003815d96de8
parent8c5d9808e95739c9001b852464fd58fd0f583280
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/ath/ath5k/eeprom.c
drivers/net/wireless/zd1211rw/zd_mac.c