linux/drivers/bcma, branch v3.9Linux kernel source treehttps://git.amat.us/linux/atom/drivers/bcma?h=v3.92013-03-01T18:52:03ZMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem2013-03-01T18:52:03ZJohn W. Linvillelinville@tuxdriver.com2013-03-01T18:52:03Zurn:sha1:98b7ff9a4977e4f4f451c30288b197ad79e5ab7fbcma: init spin lock2013-02-27T19:12:51ZHauke Mehrtenshauke@hauke-m.de2013-02-23T22:30:22Zurn:sha1:f45dd363bee071a62e32398a0ae4a0214b8029eb
This spin lock was not initialized.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless2013-02-14T19:23:33ZJohn W. Linvillelinville@tuxdriver.com2013-02-14T19:23:33Zurn:sha1:b90af3b8c69730fb25646c04866dfccec2f1314b
Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net2013-02-08T23:02:14ZDavid S. Millerdavem@davemloft.net2013-02-08T23:02:14Zurn:sha1:fd5023111cf720db890ef34f305ac5d427e690a0
Synchronize with 'net' in order to sort out some l2tp, wireless, and
ipv6 GRE fixes that will be built on top of in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem2013-02-08T18:16:17ZJohn W. Linvillelinville@tuxdriver.com2013-02-08T18:16:17Zurn:sha1:f5237f278f30a92401539a54f87ee0c717b6f818Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem2013-02-06T18:55:44ZJohn W. Linvillelinville@tuxdriver.com2013-02-06T18:55:44Zurn:sha1:b3b66ae4c8aff0636521034d824b8953dc617335Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net2013-02-05T19:12:20ZDavid S. Millerdavem@davemloft.net2013-02-05T19:12:20Zurn:sha1:188d1f76d0dd3715ceeadfa31376867c3395eb41
Conflicts:
drivers/net/ethernet/intel/e1000e/ethtool.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/wireless/iwlwifi/dvm/tx.c
net/ipv6/route.c
The ipv6 route.c conflict is simple, just ignore the 'net' side change
as we fixed the same problem in 'net-next' by eliminating cached
neighbours from ipv6 routes.
The e1000e conflict is an addition of a new statistic in the ethtool
code, trivial.
The vmxnet3 conflict is about one change in 'net' removing a guarding
conditional, whilst in 'net-next' we had a netdev_info() conversion.
The iwlwifi conflict is dealing with a WARN_ON() conversion in
'net-next' vs. a revert happening in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
bcma: unregister gpios before unloading bcma2013-02-04T21:46:24ZHauke Mehrtenshauke@hauke-m.de2013-02-03T22:25:33Zurn:sha1:c50ae9470e542862f782e2d9c106270152bbf3ce
This patch unregisters the gpio chip before bcma gets unloaded.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reported-by: Piotr Haber <phaber@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
bcma: Xflash: reorder includes to make pr_fmt work2013-02-01T19:27:21ZRafał Miłeckizajec5@gmail.com2013-01-30T07:46:53Zurn:sha1:58b27101e16f2a24e901dd9e67c2ab6e5707d6a3
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem2013-02-01T18:43:25ZJohn W. Linvillelinville@tuxdriver.com2013-02-01T18:43:25Zurn:sha1:ed6882ac40552034ae6bde3e540b84c832dc8491