Merge branch 'atmel'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 11 Nov 2005 13:14:56 +0000 (08:14 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 11 Nov 2005 13:14:56 +0000 (08:14 -0500)
commit2ecc26b87a2b3e8650d3c7fe3fc85a8c73d5560d
tree0453e556241830d675d2063b74ac3b769326b379
parent6af37fa9928a0d50cda1bad14b2eda8c1a4d1a0e
parentb16a228d05a95b27d77d07a91688382f68ece8a7
Merge branch 'atmel'
drivers/net/wireless/atmel.c
drivers/net/wireless/atmel_cs.c