Merge remote-tracking branch 'security/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 13 Dec 2011 04:23:33 +0000 (15:23 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 13 Dec 2011 04:23:33 +0000 (15:23 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:23:33 +0000 (15:23 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:23:33 +0000 (15:23 +1100)
diff --cc lib/Kconfig
Simple merge
diff --cc lib/Makefile

index ff00d4dcb7ed392291b96f91e87afe1bfbbefe3a,0f5cff267aff41261b3679a3aa46916ab2a6ee8d..2cf2002dda89228993117faecb1683643960065e
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -115,8 -115,9 +115,11 @@@ obj-$(CONFIG_CPU_RMAP) += cpu_rmap.
   
   obj-$(CONFIG_CORDIC) += cordic.o
   
+ +obj-$(CONFIG_DQL) += dynamic_queue_limits.o
+ +
+ obj-$(CONFIG_MPILIB) += mpi/
+ obj-$(CONFIG_DIGSIG) += digsig.o
+ 
   hostprogs-y   := gen_crc32table
   clean-files   := crc32table.h
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Dec 2011 04:23:33 +0000 (15:23 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Dec 2011 04:23:33 +0000 (15:23 +1100)
		1	2
lib/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history