Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorRalf Baechle <ralf@linux-mips.org>
Thu, 21 Feb 2013 15:16:55 +0000 (16:16 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 22 Feb 2013 09:07:30 +0000 (10:07 +0100)
commitedb15d83a875a1f4b1576188844db5c330c3267d
tree74d54eab401b6ccf2a6ad4821227108a8d160f03
parent8bfc245f9ad7bd4e461179e4e7852ef99b8b6144
parenta0b1c42951dd06ec83cc1bc2c9788131d9fefcd8
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into mips-for-linux-next

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.
arch/mips/Kconfig
arch/mips/include/uapi/asm/socket.h
drivers/net/ethernet/broadcom/b44.c
drivers/net/ethernet/broadcom/bgmac.c