linux.git/drivers/ssb, branch v3.9-rc2 Linux kernel source tree Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next 2013-02-22T09:07:30+00:00 Ralf Baechle ralf@linux-mips.org 2013-02-21T15:16:55+00:00 edb15d83a875a1f4b1576188844db5c330c3267d Conflicts: include/linux/ssb/ssb_driver_gige.h Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/- bgmac.c due to change of an API. 
Conflicts:
    include/linux/ssb/ssb_driver_gige.h

Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.
MIPS: BCM47XX: add bcm47xx prefix in front of nvram function names 2013-02-15T18:01:57+00:00 Hauke Mehrtens hauke@hauke-m.de 2012-12-26T19:51:14+00:00 111bd981e2216827aab95503596501ab71bc7a7d The nvram functions are exported and used by some normal drivers. To prevent name clashes with ofter parts of the kernel code add a bcm47xx_ prefix in front of the function names and the header file name. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Patchwork: http://patchwork.linux-mips.org/patch/4744/ Signed-off-by: John Crispin <blogic@openwrt.org> 
The nvram functions are exported and used by some normal drivers. To
prevent name clashes with ofter parts of the kernel code add a bcm47xx_
prefix in front of the function names and the header file name.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Patchwork: http://patchwork.linux-mips.org/patch/4744/
Signed-off-by: John Crispin <blogic@openwrt.org>
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-02-08T23:02:14+00:00 David S. Miller davem@davemloft.net 2013-02-08T23:02:14+00:00 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> 
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-davem 2013-02-08T18:16:17+00:00 John W. Linville linville@tuxdriver.com 2013-02-08T18:16:17+00:00 f5237f278f30a92401539a54f87ee0c717b6f818 






Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2013-02-06T18:55:44+00:00

John W. Linville
linville@tuxdriver.com

2013-02-06T18:55:44+00:00

b3b66ae4c8aff0636521034d824b8953dc617335












ssb: unregister gpios before unloading ssb
2013-02-04T21:46:24+00:00

Hauke Mehrtens
hauke@hauke-m.de

2013-02-03T22:25:34+00:00

600485edaef65d89f5c44ce62baa7cac961cd50d

This patch unregisters the gpio chip before ssb gets unloaded.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>





This patch unregisters the gpio chip before ssb gets unloaded.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>







ssb: add gpio_to_irq
2013-01-30T20:07:06+00:00

Hauke Mehrtens
hauke@hauke-m.de

2013-01-26T20:38:35+00:00

a6ca2e10f795111a90a4efabb07717258669e03d

The old bcm47xx gpio code had support for gpio_to_irq, but the new
code did not provide this function, but returned -ENXIO all the time.
This patch adds the missing function.

arch/mips/bcm47xx/wgt634u.c calls gpio_to_irq() and got the correct irq
number with the old gpio handling code. With this patch the code in
wgt634u.c should work again. I do not have a wgt634u to test this.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>





The old bcm47xx gpio code had support for gpio_to_irq, but the new
code did not provide this function, but returned -ENXIO all the time.
This patch adds the missing function.

arch/mips/bcm47xx/wgt634u.c calls gpio_to_irq() and got the correct irq
number with the old gpio handling code. With this patch the code in
wgt634u.c should work again. I do not have a wgt634u to test this.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>







ssb: register platform device for parallel flash
2013-01-30T20:06:46+00:00

Rafał Miłecki
zajec5@gmail.com

2013-01-25T10:36:26+00:00

c7a4a9e3880cc8cdc1f2958796e517d9d96ff7e0

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>





Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>







ssb: trivial: use pflash helper variable
2013-01-30T20:06:45+00:00

Rafał Miłecki
zajec5@gmail.com

2013-01-25T10:36:25+00:00

f1ab57e3a114173fdb94219937191f0c673e87dd

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>





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-next into for-davem
2013-01-28T19:43:00+00:00

John W. Linville
linville@tuxdriver.com

2013-01-28T19:43:00+00:00

4205e6ef4ee747aa81930537b6035086ba5f1e28