tree f123e7926f3f5bfef11f13b0a0fcf0e38c1f99f8
parent 5b435de0d786869c95d1962121af0d7df2542009
parent 694440d93b9963a2c426708cb11494236c0b2552
author John W. Linville <linville@tuxdriver.com> 1318362989 -0400
committer John W. Linville <linville@tuxdriver.com> 1318362989 -0400

Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx