]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 03:01:03 +0000 (14:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 03:01:03 +0000 (14:01 +1100)
Conflicts:
lib/Makefile

1  2 
lib/Kconfig
lib/Makefile

diff --cc lib/Kconfig
Simple merge
diff --cc lib/Makefile
index ff00d4dcb7ed392291b96f91e87afe1bfbbefe3a,0f5cff267aff41261b3679a3aa46916ab2a6ee8d..2cf2002dda89228993117faecb1683643960065e
@@@ -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