diff --git a/[refs] b/[refs] index 3aa807b259d5..c4190da89ccf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 407f9be4544538674fb83a2d064a25428595c7ff +refs/heads/master: f680f25c635a1a4327bef34fcbe1e9e3777b546c diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index fdc0119963e7..988553ec9ce5 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1613,6 +1613,16 @@ L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/bnx2x/ +BROADCOM BCM2835 ARM ARCHICTURE +M: Stephen Warren +L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) +T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git +S: Maintained +F: arch/arm/mach-bcm2835/ +F: arch/arm/boot/dts/bcm2835* +F: arch/arm/configs/bcm2835_defconfig +F: drivers/*/*bcm2835* + BROADCOM TG3 GIGABIT ETHERNET DRIVER M: Matt Carlson M: Michael Chan