| commit | e9a68707d736f4f73d7e209885d7b4c5c452b1dc | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Oct 08 15:39:28 2010 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Oct 08 15:39:28 2010 -0400 |
| tree | d9f76964c77c1059483b08436ed060b702b8e25d | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 [diff] | |
| parent | 15a6321d1c0f8db561932cd99e1b9897981da71f [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ipw2x00/ipw2200.c