From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Dec 2011 03:24:43 +0000 (+1100)
Subject: Merge remote-tracking branch 'security/next'
X-Git-Tag: next-20111221~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6366d8c082416d275c04e85db2378fc2e9a28ce0;p=karo-tx-linux.git

Merge remote-tracking branch 'security/next'

Conflicts:
	lib/Makefile
---

6366d8c082416d275c04e85db2378fc2e9a28ce0
diff --cc lib/Makefile
index ff00d4dcb7ed,0f5cff267aff..2cf2002dda89
--- a/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