]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Wed, 25 May 2011 17:28:55 +0000 (13:28 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 May 2011 17:28:55 +0000 (13:28 -0400)
1  2 
drivers/net/wireless/airo.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/b43/b43.h
drivers/net/wireless/iwlwifi/iwl-agn-calib.c
drivers/net/wireless/iwlwifi/iwl-agn.c

Simple merge
Simple merge