Merge branch 'linus' into cpus4096

Conflicts:

	drivers/acpi/processor_throttling.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 20 deletions

diff --git a/drivers/net/fec_8xx/Kconfig b/drivers/net/fec_8xx/Kconfig
deleted file mode 100644
index afb34ded26ee..000000000000
--- a/drivers/net/fec_8xx/Kconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-config FEC_8XX
-        tristate "Motorola 8xx FEC driver"
-        depends on 8XX
-        select MII
-
-config FEC_8XX_GENERIC_PHY
-        bool "Support any generic PHY"
-        depends on FEC_8XX
-        default y
-
-config FEC_8XX_DM9161_PHY
-        bool "Support DM9161 PHY"
-        depends on FEC_8XX
-        default n
-
-config FEC_8XX_LXT971_PHY
-        bool "Support LXT971/LXT972 PHY"
-        depends on FEC_8XX
-        default n
-