| commit | 56e1bd770614da94f35e88c150cf9edf8d0b57a2 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jan 29 14:03:20 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jan 29 14:03:20 2013 -0500 |
| tree | 5a18f6e797e7d60b634fe0d229ae624625af073e | |
| parent | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 [diff] | |
| parent | 5b37649bbcfc14c1ecfb76c5b018dd686924b946 [diff] |
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx Conflicts: drivers/net/wireless/ti/wlcore/main.c