]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 17:50:47 +0000 (09:50 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 17:50:47 +0000 (09:50 -0800)
commitf9a023607e2e0cc0ef5cf83e0982fc0223462d07
tree1ede9804ee33d7eefb73e9535e0399dfd7f58c00
parent7d6d9fbec374b8142cfc23c14023bafe8ee89328
parent1d93cc64d3c110529112c3cfb83f68be999027d3
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c