diff --git a/[refs] b/[refs]
index 8147af3df856..d19681d9aac8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c882f64130071eaebdc0861bee34a73e436f004
+refs/heads/master: e9cc8bddaea3944fabfebb968bc88d603239beed
diff --git a/trunk/lib/Kconfig b/trunk/lib/Kconfig
index 03c2c24b9083..cea9e30a88ff 100644
--- a/trunk/lib/Kconfig
+++ b/trunk/lib/Kconfig
@@ -174,4 +174,10 @@ config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
        bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS
        depends on EXPERIMENTAL && BROKEN
 
+#
+# Netlink attribute parsing support is select'ed if needed
+#
+config NLATTR
+	bool
+
 endmenu
diff --git a/trunk/lib/Makefile b/trunk/lib/Makefile
index 32b0e64ded27..b2c09da02cae 100644
--- a/trunk/lib/Makefile
+++ b/trunk/lib/Makefile
@@ -84,6 +84,8 @@ obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o
 
 obj-$(CONFIG_DYNAMIC_PRINTK_DEBUG) += dynamic_printk.o
 
+obj-$(CONFIG_NLATTR) += nlattr.o
+
 hostprogs-y	:= gen_crc32table
 clean-files	:= crc32table.h
 
diff --git a/trunk/net/netlink/attr.c b/trunk/lib/nlattr.c
similarity index 100%
rename from trunk/net/netlink/attr.c
rename to trunk/lib/nlattr.c
diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
index cdb8fdef6c4a..eab40a481356 100644
--- a/trunk/net/Kconfig
+++ b/trunk/net/Kconfig
@@ -4,6 +4,7 @@
 
 menuconfig NET
 	bool "Networking support"
+	select NLATTR
 	---help---
 	  Unless you really know what you are doing, you should say Y here.
 	  The reason is that some programs need kernel networking support even
diff --git a/trunk/net/netlink/Makefile b/trunk/net/netlink/Makefile
index e3589c2de49e..bdd6ddf4e95b 100644
--- a/trunk/net/netlink/Makefile
+++ b/trunk/net/netlink/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the netlink driver.
 #
 
-obj-y  				:= af_netlink.o attr.o genetlink.o
+obj-y  				:= af_netlink.o genetlink.o