diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-06 18:50:45 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-06 18:50:45 +0400 |
| commit | e08fd975bf26aa8063cadd245817e042f570472d (patch) | |
| tree | 2b2a705710e6374cc037f89bcc7bfc25047485ba /drivers/spi/spi-pxa2xx-pci.c | |
| parent | 251c9ba19143caa5eb5b6ec52c77c70c9d7b3d8f (diff) | |
| parent | a59b40b30f3f51bf5c56c15a7dc4da11b424a34b (diff) | |
| download | linux-e08fd975bf26aa8063cadd245817e042f570472d.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c
Diffstat (limited to 'drivers/spi/spi-pxa2xx-pci.c')
0 files changed, 0 insertions, 0 deletions