| commit | fa9a741b841d0c2db04875310a06e8718c56fd4f | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Feb 01 12:01:27 2011 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Feb 01 12:01:27 2011 -0500 |
| tree | 673c6ecfc34c7534503be739e0be777ee6422424 | |
| parent | 7c3ee9e3fd065e878a2dbaec9d417441c59799be [diff] | |
| parent | 479600777bb588724d044815415f7d708d06644b [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/wl12xx/spi.c