Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
commite6d8965e22f055d3bdb572bcfeb6ebd6bead39ba
authorRalf Baechle <ralf@linux-mips.org>
Wed, 26 Oct 2011 21:32:57 +0000 (26 22:32 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 26 Oct 2011 21:37:08 +0000 (26 22:37 +0100)
tree4059e0428d3fdcf01a948710d493cd1e28ca753d
parentb3fd3d10ab9399e28b713c74cc55fa3564d5123e
parent138c4ae9cfda8fdcf9e137457853b09ef8cf8f77
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux
drivers/net/ethernet/Kconfig
drivers/net/ethernet/Makefile
drivers/net/ethernet/pmc-sierra/Kconfig
drivers/net/ethernet/pmc-sierra/Makefile
drivers/net/ethernet/pmc-sierra/titan_ge.c
drivers/net/ethernet/pmc-sierra/titan_ge.h
drivers/net/ethernet/pmc-sierra/titan_mdio.c
drivers/net/ethernet/pmc-sierra/titan_mdio.h