Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c

1 files changed, 0 insertions, 11 deletions

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 6a6409adc564..e856218da90d 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -186,17 +186,6 @@ config PREEMPT
           Say Y here if you are building a kernel for a desktop, embedded
           or real-time system.  Say N if you are unsure.
 
-config PREEMPT_BKL
-        bool "Preempt The Big Kernel Lock"
-        depends on PREEMPT
-        default y
-        help
-          This option reduces the latency of the kernel by making the
-          big kernel lock preemptible.
-
-          Say Y here if you are building a kernel for a desktop system.
-          Say N if you are unsure.
-
 config MN10300_CURRENT_IN_E2
         bool "Hold current task address in E2 register"
         default y